[leksah-server] update to 0.14.3.1; no longer depend on attoparsec-conduit

Jens Petersen petersen at fedoraproject.org
Wed Mar 4 06:10:33 UTC 2015


commit 4832c55bef3e66cf84bf95dfe135d024ac700d11
Author: Jens Petersen <petersen at redhat.com>
Date:   Wed Mar 4 15:05:26 2015 +0900

    update to 0.14.3.1; no longer depend on attoparsec-conduit

 .gitignore                             |  1 +
 leksah-server-0.14-conduit-extra.patch | 40 ----------------------------------
 leksah-server-attoparsec-conduit.patch | 29 ++++++++++++++++++++++++
 leksah-server.spec                     | 12 +++++++---
 sources                                |  2 +-
 5 files changed, 40 insertions(+), 44 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 74b135f..8dca531 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
 /leksah-server-0.12.1.2.tar.gz
 /leksah-server-0.13.1.1.tar.gz
 /leksah-server-0.14.0.0.tar.gz
+/leksah-server-0.14.3.1.tar.gz
diff --git a/leksah-server-attoparsec-conduit.patch b/leksah-server-attoparsec-conduit.patch
new file mode 100644
index 0000000..4f01bb2
--- /dev/null
+++ b/leksah-server-attoparsec-conduit.patch
@@ -0,0 +1,29 @@
+--- leksah-server-0.14.3.1/leksah-server.cabal~	2015-03-04 14:58:45.376623901 +0900
++++ leksah-server-0.14.3.1/leksah-server.cabal	2015-03-04 14:59:52.821629925 +0900
+@@ -38,7 +38,7 @@
+                pretty >=1.0.1.0 && <1.2, time >=1.1 && <1.5, deepseq >=1.1 && <1.4,
+                hslogger >= 1.0.7 && <1.3, conduit >= 1.0.8 && <1.3,
+                conduit-extra >=1.0.0.1 && <1.2, resourcet,
+-               attoparsec-conduit >=1.0.1.2 && <1.2, attoparsec >=0.10.0.3 && <0.13,
++               attoparsec >=0.10.0.3 && <0.13,
+                transformers >=0.2.2.0 && <0.5, strict >=0.3.2 && <0.4, text >=0.11.3.1 && <1.3,
+                HTTP >=4000.1.2 && <4000.3
+     if (impl(ghc >= 7.8))
+@@ -101,7 +101,7 @@
+                pretty >=1.0.1.0 && <1.2, time >=1.1 && <1.5, deepseq >=1.1 && <1.4,
+                hslogger >= 1.0.7 && <1.3, conduit >= 1.0.8 && <1.3,
+                conduit-extra >=1.0.0.1 && <1.2, resourcet,
+-               attoparsec-conduit >=1.0.1.2 && <1.2, attoparsec >=0.10.0.3 && <0.13,
++               attoparsec >=0.10.0.3 && <0.13,
+                transformers >=0.2.2.0 && <0.5, strict >=0.3.2 && <0.4, text >=0.11.3.1 && <1.3,
+                HTTP >=4000.1.2 && <4000.3
+     if (impl(ghc >= 7.8))
+@@ -173,7 +173,7 @@
+     build-depends:  base >= 4.0.0.0 && <4.8, hslogger >= 1.0.7 && <1.3, deepseq >=1.1 && <1.4,
+                bytestring >=0.9.0.1 && <0.11, conduit >= 1.0.8 && <1.3,
+                conduit-extra >=1.0.0.1 && <1.2, resourcet,
+-               attoparsec-conduit >=1.0.1.2 && <1.2, attoparsec >=0.10.0.3 && <0.13,
++               attoparsec >=0.10.0.3 && <0.13,
+                transformers >=0.2.2.0 && <0.5, text >=0.11.3.1 && <1.3
+ 
+     if (impl(ghc >= 7.2))
diff --git a/leksah-server.spec b/leksah-server.spec
index f8580f4..1bc866f 100644
--- a/leksah-server.spec
+++ b/leksah-server.spec
@@ -9,7 +9,7 @@
 %endif
 
 Name:           %{pkg_name}
-Version:        0.14.0.0
+Version:        0.14.3.1
 Release:        1%{?dist}
 Summary:        Metadata collection for leksah
 
@@ -18,17 +18,18 @@ Summary:        Metadata collection for leksah
 License:        GPL+
 Url:            https://hackage.haskell.org/package/%{name}
 Source0:        https://hackage.haskell.org/package/%{name}-%{version}/%{name}-%{version}.tar.gz
-Patch0:         leksah-server-0.14-conduit-extra.patch
+Patch0:         leksah-server-attoparsec-conduit.patch
 
 BuildRequires:  ghc-Cabal-devel
 BuildRequires:  ghc-rpm-macros
 # Begin cabal-rpm deps:
-BuildRequires:  ghc-attoparsec-conduit-devel
+BuildRequires:  ghc-HTTP-devel
 BuildRequires:  ghc-attoparsec-devel
 BuildRequires:  ghc-binary-devel
 BuildRequires:  ghc-binary-shared-devel
 BuildRequires:  ghc-bytestring-devel
 BuildRequires:  ghc-conduit-devel
+BuildRequires:  ghc-conduit-extra-devel
 BuildRequires:  ghc-containers-devel
 BuildRequires:  ghc-deepseq-devel
 BuildRequires:  ghc-directory-devel
@@ -79,6 +80,7 @@ This package provides the Haskell %{name} library development files.
 
 %prep
 %setup -q
+cabal-tweak-flag network-uri False
 # archs without threaded RTS
 %ifarch ppc64 s390 s390x
 cabal-tweak-flag threaded False
@@ -122,6 +124,10 @@ LANG=en_US.utf8
 
 
 %changelog
+* Wed Mar  4 2015 Jens Petersen <petersen at redhat.com> - 0.14.3.1-1
+- update to 0.14.3.1
+- no longer depend on attoparsec-conduit
+
 * Fri Oct 10 2014 Jens Petersen <petersen at redhat.com> - 0.14.0.0-1
 - update to 0.14.0.0
 - disable tests on armv7hl
diff --git a/sources b/sources
index dcc533e..b124918 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-68367a93b01e5dce176fe318088c69ff  leksah-server-0.14.0.0.tar.gz
+73527224551872c7bd4c92a773628fb4  leksah-server-0.14.3.1.tar.gz


More information about the scm-commits mailing list