[leksah-server] update to 0.14.0.0

[Jens Petersen]

commit 4f5a5761a82bf26eb95c7e48f4daaffccac453a2
Author: Jens Petersen <petersen at redhat.com>
Date:   Tue Sep 16 14:13:17 2014 +0900

    update to 0.14.0.0
    
    conduit-extra should not be necessary

 .gitignore                             |    1 +
 leksah-server-0.14-conduit-extra.patch |   40 ++++++++++++++++++++++++++++++++
 leksah-server.spec                     |    9 ++++++-
 sources                                |    2 +-
 4 files changed, 50 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a591588..74b135f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 /leksah-server-0.12.1.1.tar.gz
 /leksah-server-0.12.1.2.tar.gz
 /leksah-server-0.13.1.1.tar.gz
+/leksah-server-0.14.0.0.tar.gz
diff --git a/leksah-server-0.14-conduit-extra.patch b/leksah-server-0.14-conduit-extra.patch
new file mode 100644
index 0000000..ecb40d3
--- /dev/null
+++ b/leksah-server-0.14-conduit-extra.patch
@@ -0,0 +1,40 @@
+--- leksah-server-0.14.0.0/leksah-server.cabal~	2014-08-30 21:22:31.000000000 +0900
++++ leksah-server-0.14.0.0/leksah-server.cabal	2014-09-16 14:10:22.720103789 +0900
+@@ -39,7 +39,7 @@
+                ltk >=0.14.0.0 && <0.15, parsec >=2.1.0.1 && <3.2,
+                pretty >=1.0.1.0 && <1.2, time >=1.1 && <1.5, deepseq >=1.1 && <1.4,
+                hslogger >= 1.0.7 && <1.3, network >=2.2 && <3.0, conduit >= 1.0.8 && <1.2,
+-               conduit-extra >=1.0.0.1 && <1.2, resourcet,
++               resourcet,
+                attoparsec-conduit >=1.0.1.2 && <1.2, attoparsec >=0.10.0.3 && <0.13,
+                transformers >=0.2.2.0 && <0.4, strict >=0.3.2 && <0.4, text >=0.11.3.1 && <1.2
+     if (impl(ghc >= 7.8))
+@@ -103,7 +103,7 @@
+                ltk >=0.14.0.0 && <0.15, parsec >=2.1.0.1 && <3.2,
+                pretty >=1.0.1.0 && <1.2, time >=1.1 && <1.5, deepseq >=1.1 && <1.4,
+                hslogger >= 1.0.7 && <1.3, network >=2.2 && <3.0, conduit >= 1.0.8 && <1.2,
+-               conduit-extra >=1.0.0.1 && <1.2, resourcet,
++               resourcet,
+                attoparsec-conduit >=1.0.1.2 && <1.2, attoparsec >=0.10.0.3 && <0.13,
+                transformers >=0.2.2.0 && <0.4, strict >=0.3.2 && <0.4, text >=0.11.3.1 && <1.2
+     if (impl(ghc >= 7.8))
+@@ -176,7 +176,7 @@
+ --    ghc-shared-options: -auto-all -prof
+     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.2,
+-               conduit-extra >=1.0.0.1 && <1.2, resourcet,
++               resourcet,
+                attoparsec-conduit >=1.0.1.2 && <1.2, attoparsec >=0.10.0.3 && <0.13,
+                transformers >=0.2.2.0 && <0.4, text >=0.11.3.1 && <1.2
+ 
+@@ -201,7 +201,7 @@
+     build-depends: base >= 4.0.0.0 && <4.8,  hslogger >= 1.0.7 && <1.3,
+                leksah-server == 0.14.0.0,
+                HUnit >=1.2 && <1.3, transformers >=0.2.2.0 && <0.4, conduit >= 1.0.8 && <1.2,
+-               conduit-extra >=1.0.0.1 && <1.2, resourcet
++               resourcet
+ 
+     if (impl(ghc >= 7.2))
+        build-depends: process >= 1.1 && <1.3
+
+Diff finished.  Tue Sep 16 14:11:07 2014
diff --git a/leksah-server.spec b/leksah-server.spec
index 1225369..013572d 100644
--- a/leksah-server.spec
+++ b/leksah-server.spec
@@ -8,7 +8,7 @@
 %global debug_package %{nil}
 
 Name:           %{pkg_name}
-Version:        0.13.1.1
+Version:        0.14.0.0
 Release:        1%{?dist}
 Summary:        Metadata collection for leksah
 
@@ -17,6 +17,7 @@ Summary:        Metadata collection for leksah
 License:        GPL+
 Url:            http://hackage.haskell.org/package/%{name}
 Source0:        http://hackage.haskell.org/package/%{name}-%{version}/%{name}-%{version}.tar.gz
+Patch0:         leksah-server-0.14-conduit-extra.patch
 
 BuildRequires:  ghc-Cabal-devel
 BuildRequires:  ghc-rpm-macros
@@ -27,6 +28,7 @@ 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
@@ -40,6 +42,7 @@ BuildRequires:  ghc-network-devel
 BuildRequires:  ghc-parsec-devel
 BuildRequires:  ghc-pretty-devel
 BuildRequires:  ghc-process-devel
+BuildRequires:  ghc-resourcet-devel
 BuildRequires:  ghc-strict-devel
 BuildRequires:  ghc-text-devel
 BuildRequires:  ghc-time-devel
@@ -80,6 +83,7 @@ This package provides the Haskell %{name} library development files.
 %ifarch ppc64 s390 s390x
 cabal-tweak-flag threaded False
 %endif
+%patch0 -p1
 
 
 %build
@@ -120,6 +124,9 @@ LANG=en_US.utf8
 
 
 %changelog
+* Tue Sep 16 2014 Jens Petersen <petersen at redhat.com> - 0.14.0.0-1
+- update to 0.14.0.0
+
 * Tue Sep 02 2014 Jens Petersen <petersen at redhat.com> - 0.13.1.1-1
 - update to 0.13.1.1
 
diff --git a/sources b/sources
index ac914bf..dcc533e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-22f78b8130f9f421a5007e45ad951629  leksah-server-0.13.1.1.tar.gz
+68367a93b01e5dce176fe318088c69ff  leksah-server-0.14.0.0.tar.gz