- updated to 0.3.1.0, pl, unified

diff --git a/ghc-MonadCatchIO-transformers.spec b/ghc-MonadCatchIO-transformers.spec
index 5d3b6227dd467d5ce1b5106ce13ba59df046b042..178aaeb4f8e160ead7b5c86907f005a95e8257bc 100644 (file)
--- a/ghc-MonadCatchIO-transformers.spec
+++ b/ghc-MonadCatchIO-transformers.spec
@@ -1,21 +1,47 @@
+#
+# Conditional build:
+%bcond_without prof    # profiling library
+#

 %define                pkgname MonadCatchIO-transformers
 Summary:       Monad-transformer compatible version of the Control.Exception module
 %define                pkgname MonadCatchIO-transformers
 Summary:       Monad-transformer compatible version of the Control.Exception module

+Summary(pl.UTF-8):     Wersja modułu Control.Exception zgodna z transformatorami monad

 Name:          ghc-%{pkgname}
 Name:          ghc-%{pkgname}

-Version:       0.3.0.0
+Version:       0.3.1.0

 Release:       1
 License:       BSD
 Group:         Development/Languages
 Release:       1
 License:       BSD
 Group:         Development/Languages

-Source0:       http://hackage.haskell.org/packages/archive/%{pkgname}/%{version}/%{pkgname}-%{version}.tar.gz
-# Source0-md5: 6b8cce214b5e5120e6004a2c112bb1c3
-URL:           http://hackage.haskell.org/package/PACKAGE_NAME/
+#Source0Download: http://hackage.haskell.org/package/MonadCatchIO-transformers
+Source0:       http://hackage.haskell.org/package/%{pkgname}-%{version}/%{pkgname}-%{version}.tar.gz
+# Source0-md5: 3b54254de4a192fdbdea06d2950cac8d
+URL:           http://hackage.haskell.org/package/MonadCatchIO-transformers

 BuildRequires: ghc >= 6.12.3
 BuildRequires: ghc >= 6.12.3

-BuildRequires: ghc-prof
-BuildRequires: ghc-extensible-exceptions
-BuildRequires: ghc-extensible-exceptions-prof
+BuildRequires: ghc-base < 4.8
+BuildRequires: ghc-extensible-exceptions >= 0.1
+BuildRequires: ghc-extensible-exceptions < 0.2
+BuildRequires: ghc-monads-tf >= 0.1
+BuildRequires: ghc-monads-tf < 0.2
+BuildRequires: ghc-transformers >= 0.2
+BuildRequires: ghc-transformers < 0.4
+%if %{with prof}
+BuildRequires: ghc-prof >= 6.12.3
+BuildRequires: ghc-base-prof < 4.8
+BuildRequires: ghc-extensible-exceptions-prof >= 0.1
+BuildRequires: ghc-extensible-exceptions-prof < 0.2
+BuildRequires: ghc-monads-tf-prof >= 0.1
+BuildRequires: ghc-monads-tf-prof < 0.2
+BuildRequires: ghc-transformers-prof >= 0.2
+BuildRequires: ghc-transformers-prof < 0.4
+%endif

 BuildRequires: rpmbuild(macros) >= 1.608
 %requires_releq        ghc
 Requires(post,postun): /usr/bin/ghc-pkg
 BuildRequires: rpmbuild(macros) >= 1.608
 %requires_releq        ghc
 Requires(post,postun): /usr/bin/ghc-pkg

-Requires:      ghc-extensible-exceptions
+Requires:      ghc-base < 4.8
+Requires:      ghc-extensible-exceptions >= 0.1
+Requires:      ghc-extensible-exceptions < 0.2
+Requires:      ghc-monads-tf >= 0.1
+Requires:      ghc-monads-tf < 0.2
+Requires:      ghc-transformers >= 0.2
+Requires:      ghc-transformers < 0.4

 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 # debuginfo is not useful for ghc
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 # debuginfo is not useful for ghc


@@ -31,12 +57,26 @@ monad transformers (from the transformers package) with IO as the base
 monad. You can extend this functionality to other monads, by creating
 an instance of the MonadCatchIO class.
 
 monad. You can extend this functionality to other monads, by creating
 an instance of the MonadCatchIO class.
 

+%description -l pl.UTF-8
+Ten pakiet dostarcza funkcje do rzucania i przechwytywania wyjątków. W
+przeciwieństwie do funkcji z Control.Exceptions, działających w IO, te
+działają w dowolnym stosie transformatorów monad (z pakietu
+transformers) z IO jako podstawową monadą. Można rozszerzać tę
+funkcjonalność na inne monady poprzez tworzenie instancji klasy
+MonadCatchIO.
+

 %package prof
 Summary:       Profiling %{pkgname} library for GHC
 Summary(pl.UTF-8):     Biblioteka profilująca %{pkgname} dla GHC.
 Group:         Development/Libraries
 Requires:      %{name} = %{version}-%{release}
 %package prof
 Summary:       Profiling %{pkgname} library for GHC
 Summary(pl.UTF-8):     Biblioteka profilująca %{pkgname} dla GHC.
 Group:         Development/Libraries
 Requires:      %{name} = %{version}-%{release}

-Requires:      ghc-extensible-exceptions-prof
+Requires:      ghc-base-prof < 4.8
+Requires:      ghc-extensible-exceptions-prof >= 0.1
+Requires:      ghc-extensible-exceptions-prof < 0.2
+Requires:      ghc-monads-tf-prof >= 0.1
+Requires:      ghc-monads-tf-prof < 0.2
+Requires:      ghc-transformers-prof >= 0.2
+Requires:      ghc-transformers-prof < 0.4

 
 %description prof
 Profiling %{pkgname} library for GHC.  Should be installed when
 
 %description prof
 Profiling %{pkgname} library for GHC.  Should be installed when


@@ -50,7 +90,8 @@ kiedy potrzebujemy systemu profilującego z GHC.
 %setup -q -n %{pkgname}-%{version}
 
 %build
 %setup -q -n %{pkgname}-%{version}
 
 %build

-runhaskell Setup.hs configure -v2 --enable-library-profiling \
+runhaskell Setup.hs configure -v2 \
+       %{?with_prof:--enable-library-profiling} \

        --prefix=%{_prefix} \
        --libdir=%{_libdir} \
        --libexecdir=%{_libexecdir} \
        --prefix=%{_prefix} \
        --libdir=%{_libdir} \
        --libexecdir=%{_libexecdir} \


@@ -71,7 +112,7 @@ cp -a $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} %{name}-%{version}-doc
 %{__rm} -r $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 
 runhaskell Setup.hs register \
 %{__rm} -r $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 
 runhaskell Setup.hs register \

-       --gen-pkg-config=$RPM_BUILD_ROOT/%{_libdir}/%{ghcdir}/package.conf.d/%{pkgname}.conf
+       --gen-pkg-config=$RPM_BUILD_ROOT%{_libdir}/%{ghcdir}/package.conf.d/%{pkgname}.conf

 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT


@@ -87,15 +128,16 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{name}-%{version}-doc/*
 %{_libdir}/%{ghcdir}/package.conf.d/%{pkgname}.conf
 %dir %{_libdir}/%{ghcdir}/%{pkgname}-%{version}
 %doc %{name}-%{version}-doc/*
 %{_libdir}/%{ghcdir}/package.conf.d/%{pkgname}.conf
 %dir %{_libdir}/%{ghcdir}/%{pkgname}-%{version}

-%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/*.o
-%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/*.a
-%exclude %{_libdir}/%{ghcdir}/%{pkgname}-%{version}/*_p.a
-
+%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/HSMonadCatchIO-transformers-%{version}.o
+%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/libHSMonadCatchIO-transformers-%{version}.a

 %dir %{_libdir}/%{ghcdir}/%{pkgname}-%{version}/Control
 %dir %{_libdir}/%{ghcdir}/%{pkgname}-%{version}/Control/Monad
 %dir %{_libdir}/%{ghcdir}/%{pkgname}-%{version}/Control
 %dir %{_libdir}/%{ghcdir}/%{pkgname}-%{version}/Control/Monad

-%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/Control/Monad/*.hi
+%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/Control/Monad/CatchIO.hi
+%dir %{_libdir}/%{ghcdir}/%{pkgname}-%{version}/Control/Monad/CatchIO
+%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/Control/Monad/CatchIO/*.hi

 
 %files prof
 %defattr(644,root,root,755)
 
 %files prof
 %defattr(644,root,root,755)

-%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/*_p.a
-%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/Control/Monad/*.p_hi
+%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/libHSMonadCatchIO-transformers-%{version}_p.a
+%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/Control/Monad/CatchIO.p_hi
+%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/Control/Monad/CatchIO/*.p_hi