- up to 1.3.2

diff --git a/ghc-conduit.spec b/ghc-conduit.spec
index 0ec46860676ec64aef859a7327127d8b06d7746c..ac976caba58a1d7543d1feba65ddf1008da22ffc 100644 (file)
--- a/ghc-conduit.spec
+++ b/ghc-conduit.spec
@@ -6,75 +6,63 @@
 Summary:       Streaming data processing library
 Summary(pl.UTF-8):     Biblioteka przetwarzania danych strumieniowych
 Name:          ghc-%{pkgname}
-Version:       1.0.9.3
+Version:       1.3.2
 Release:       1
 License:       BSD
 Group:         Development/Languages
 #Source0Download: http://hackage.haskell.org/package/conduit
 Source0:       http://hackage.haskell.org/package/%{pkgname}-%{version}/%{pkgname}-%{version}.tar.gz
-# Source0-md5: 29313bacd0463b86ed04104cce355aba
+# Source0-md5: 162fbaa267a0412d98b0536e71bccd6a
 URL:           http://hackage.haskell.org/package/conduit
 BuildRequires: ghc >= 6.12.3
 BuildRequires: ghc-base >= 4.3
-BuildRequires: ghc-base < 5
-BuildRequires: ghc-bytestring >= 0.9
-BuildRequires: ghc-containers
+BuildRequires: ghc-bytestring
 BuildRequires: ghc-directory
-BuildRequires: ghc-lifted-base >= 0.1
-BuildRequires: ghc-mmorph
-BuildRequires: ghc-monad-control >= 0.3.1
-BuildRequires: ghc-monad-control < 0.4
+BuildRequires: ghc-exceptions
+BuildRequires: ghc-filepath
+BuildRequires: ghc-mono-traversable >= 1.0.7
 BuildRequires: ghc-mtl
-BuildRequires: ghc-resourcet >= 0.4.3
-BuildRequires: ghc-resourcet < 0.5
-BuildRequires: ghc-text >= 0.11
-BuildRequires: ghc-transformers >= 0.2.2
-BuildRequires: ghc-transformers < 0.4
-BuildRequires: ghc-transformers-base >= 0.4.1
-BuildRequires: ghc-transformers-base < 0.5
-BuildRequires: ghc-void >= 0.5.5
+BuildRequires: ghc-primitive
+BuildRequires: ghc-resourcet >= 1.2
+BuildRequires: ghc-text
+BuildRequires: ghc-transformers >= 0.4
+BuildRequires: ghc-unix
+BuildRequires: ghc-unliftio-core
+BuildRequires: ghc-vector
 %if %{with prof}
 BuildRequires: ghc-prof >= 6.12.3
 BuildRequires: ghc-base-prof >= 4.3
-BuildRequires: ghc-base-prof < 5
-BuildRequires: ghc-bytestring-prof >= 0.9
-BuildRequires: ghc-containers-prof
+BuildRequires: ghc-bytestring-prof
 BuildRequires: ghc-directory-prof
-BuildRequires: ghc-lifted-base-prof >= 0.1
-BuildRequires: ghc-mmorph-prof
-BuildRequires: ghc-monad-control-prof >= 0.3.1
-BuildRequires: ghc-monad-control-prof < 0.4
+BuildRequires: ghc-exceptions-prof
+BuildRequires: ghc-filepath-prof
+BuildRequires: ghc-mono-traversable-prof >= 1.0.7
 BuildRequires: ghc-mtl-prof
-BuildRequires: ghc-resourcet-prof >= 0.4.3
-BuildRequires: ghc-resourcet-prof < 0.5
-BuildRequires: ghc-text-prof >= 0.11
-BuildRequires: ghc-transformers-prof >= 0.2.2
-BuildRequires: ghc-transformers-prof < 0.4
-BuildRequires: ghc-transformers-base-prof >= 0.4.1
-BuildRequires: ghc-transformers-base-prof < 0.5
-BuildRequires: ghc-void-prof >= 0.5.5
+BuildRequires: ghc-primitive-prof
+BuildRequires: ghc-resourcet-prof >= 1.2
+BuildRequires: ghc-text-prof
+BuildRequires: ghc-transformers-prof >= 0.4
+BuildRequires: ghc-unix-prof
+BuildRequires: ghc-unliftio-core-prof
+BuildRequires: ghc-vector-prof
 %endif
 BuildRequires: rpmbuild(macros) >= 1.608
 Requires(post,postun): /usr/bin/ghc-pkg
 %requires_eq   ghc
 Requires:      ghc-base >= 4.3
-Requires:      ghc-base < 5
-Requires:      ghc-bytestring >= 0.9
-Requires:      ghc-containers
+Requires:      ghc-bytestring
 Requires:      ghc-directory
-Requires:      ghc-lifted-base >= 0.1
-Requires:      ghc-mmorph
-Requires:      ghc-monad-control >= 0.3.1
-Requires:      ghc-monad-control < 0.4
+Requires:      ghc-exceptions
+Requires:      ghc-filepath
+Requires:      ghc-mono-traversable >= 1.0.7
 Requires:      ghc-mtl
-Requires:      ghc-resourcet >= 0.4.3
-Requires:      ghc-resourcet < 0.5
-Requires:      ghc-text >= 0.11
-Requires:      ghc-transformers >= 0.2.2
-Requires:      ghc-transformers < 0.4
-Requires:      ghc-transformers-base >= 0.4.1
-Requires:      ghc-transformers-base < 0.5
-Requires:      ghc-void >= 0.5.5
+Requires:      ghc-primitive
+Requires:      ghc-resourcet >= 1.2
+Requires:      ghc-text
+Requires:      ghc-transformers >= 0.4
+Requires:      ghc-unix
+Requires:      ghc-unliftio-core
+Requires:      ghc-vector
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 # debuginfo is not useful for ghc
@@ -104,23 +92,19 @@ Summary(pl.UTF-8): Biblioteka profilująca %{pkgname} dla GHC
 Group:         Development/Libraries
 Requires:      %{name} = %{version}-%{release}
 Requires:      ghc-base-prof >= 4.3
-Requires:      ghc-base-prof < 5
-Requires:      ghc-bytestring-prof >= 0.9
-Requires:      ghc-containers-prof
+Requires:      ghc-bytestring-prof
 Requires:      ghc-directory-prof
-Requires:      ghc-lifted-base-prof >= 0.1
-Requires:      ghc-mmorph-prof
-Requires:      ghc-monad-control-prof >= 0.3.1
-Requires:      ghc-monad-control-prof < 0.4
+Requires:      ghc-exceptions-prof
+Requires:      ghc-filepath-prof
+Requires:      ghc-mono-traversable-prof >= 1.0.7
 Requires:      ghc-mtl-prof
-Requires:      ghc-resourcet-prof >= 0.4.3
-Requires:      ghc-resourcet-prof < 0.5
-Requires:      ghc-text-prof >= 0.11
-Requires:      ghc-transformers-prof >= 0.2.2
-Requires:      ghc-transformers-prof < 0.4
-Requires:      ghc-transformers-base-prof >= 0.4.1
-Requires:      ghc-transformers-base-prof < 0.5
-Requires:      ghc-void-prof >= 0.5.5
+Requires:      ghc-primitive-prof
+Requires:      ghc-resourcet-prof >= 1.2
+Requires:      ghc-text-prof
+Requires:      ghc-transformers-prof >= 0.4
+Requires:      ghc-unix-prof
+Requires:      ghc-unliftio-core-prof
+Requires:      ghc-vector-prof
 
 %description prof
 Profiling %{pkgname} library for GHC. Should be installed when
@@ -183,22 +167,43 @@ rm -rf $RPM_BUILD_ROOT
 %doc LICENSE
 %{_libdir}/%{ghcdir}/package.conf.d/%{pkgname}.conf
 %dir %{_libdir}/%{ghcdir}/%{pkgname}-%{version}
-%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/HSconduit-%{version}.o
-%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/libHSconduit-%{version}.a
+%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/libHSconduit-%{version}-*.so
+%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/libHSconduit-%{version}-*.a
+%exclude %{_libdir}/%{ghcdir}/%{pkgname}-%{version}/libHSconduit-%{version}-*_p.a
+
+%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/*.hi
+%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/*.dyn_hi
 %dir %{_libdir}/%{ghcdir}/%{pkgname}-%{version}/Data
-%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/Data/Conduit.hi
+%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/Data/*.hi
+%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/Data/*.dyn_hi
 %dir %{_libdir}/%{ghcdir}/%{pkgname}-%{version}/Data/Conduit
 %{_libdir}/%{ghcdir}/%{pkgname}-%{version}/Data/Conduit/*.hi
-%dir %{_libdir}/%{ghcdir}/%{pkgname}-%{version}/System
-%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/System/PosixFile.hi
+%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/Data/Conduit/*.dyn_hi
+%dir %{_libdir}/%{ghcdir}/%{pkgname}-%{version}/Data/Conduit/Combinators
+%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/Data/Conduit/Combinators/*.hi
+%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/Data/Conduit/Combinators/*.dyn_hi
+%dir %{_libdir}/%{ghcdir}/%{pkgname}-%{version}/Data/Conduit/Internal
+%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/Data/Conduit/Internal/*.hi
+%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/Data/Conduit/Internal/*.dyn_hi
+%dir %{_libdir}/%{ghcdir}/%{pkgname}-%{version}/Data/Conduit/Internal/List
+%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/Data/Conduit/Internal/List/*.hi
+%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/Data/Conduit/Internal/List/*.dyn_hi
+%dir %{_libdir}/%{ghcdir}/%{pkgname}-%{version}/Data/Streaming
+%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/Data/Streaming/*.hi
+%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/Data/Streaming/*.dyn_hi
+
 
 %if %{with prof}
 %files prof
 %defattr(644,root,root,755)
-%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/libHSconduit-%{version}_p.a
-%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/Data/Conduit.p_hi
+%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/libHSconduit-%{version}-*_p.a
+%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/*.p_hi
+%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/Data/*.p_hi
 %{_libdir}/%{ghcdir}/%{pkgname}-%{version}/Data/Conduit/*.p_hi
-%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/System/PosixFile.p_hi
+%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/Data/Conduit/Combinators/*.p_hi
+%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/Data/Conduit/Internal/*.p_hi
+%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/Data/Conduit/Internal/List/*.p_hi
+%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/Data/Streaming/*.p_hi
 %endif
 
 %files doc