From da0a94d7e45d73b336c1406aa4ee1149a757e268 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Sun, 24 May 2020 22:54:38 +0200 Subject: [PATCH] - up to 1.1.3 --- ghc-mmorph.spec | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/ghc-mmorph.spec b/ghc-mmorph.spec index 52a6944..4b8c4e0 100644 --- a/ghc-mmorph.spec +++ b/ghc-mmorph.spec @@ -6,33 +6,30 @@ Summary: Monad morphisms Summary(pl.UTF-8): Morfizm monad Name: ghc-%{pkgname} -Version: 1.0.0 +Version: 1.1.3 Release: 1 License: BSD Group: Development/Languages #Source0Download: http://hackage.haskell.org/package/mmorph Source0: http://hackage.haskell.org/package/%{pkgname}-%{version}/%{pkgname}-%{version}.tar.gz -# Source0-md5: 1fabc154d44b1af97fb03b1b7dac88ae +# Source0-md5: 29bb471c81368f7c2575ac4c49bd0216 URL: http://hackage.haskell.org/package/mmorph BuildRequires: ghc >= 6.12.3 BuildRequires: ghc-base >= 4 -BuildRequires: ghc-base < 5 BuildRequires: ghc-transformers >= 0.2.0.0 -BuildRequires: ghc-transformers < 0.4 +BuildRequires: ghc-transformers-compat >= 0.3 %if %{with prof} BuildRequires: ghc-prof >= 6.12.3 BuildRequires: ghc-base-prof >= 4 -BuildRequires: ghc-base-prof < 5 BuildRequires: ghc-transformers-prof >= 0.2.0.0 -BuildRequires: ghc-transformers-prof < 0.4 +BuildRequires: ghc-transformers-compat-prof >= 0.3 %endif BuildRequires: rpmbuild(macros) >= 1.608 Requires(post,postun): /usr/bin/ghc-pkg %requires_eq ghc Requires: ghc-base >= 4 -Requires: ghc-base < 5 Requires: ghc-transformers >= 0.2.0.0 -Requires: ghc-transformers < 0.4 +Requires: ghc-transformers-compat >= 0.3 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) # debuginfo is not useful for ghc @@ -55,9 +52,8 @@ Summary(pl.UTF-8): Biblioteka profilująca %{pkgname} dla GHC Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: ghc-base-prof >= 4 -Requires: ghc-base-prof < 5 Requires: ghc-transformers-prof >= 0.2.0.0 -Requires: ghc-transformers-prof < 0.4 +Requires: ghc-transformers-compat-prof >= 0.3 %description prof Profiling %{pkgname} library for GHC. Should be installed when @@ -120,17 +116,23 @@ rm -rf $RPM_BUILD_ROOT %doc LICENSE %{_libdir}/%{ghcdir}/package.conf.d/%{pkgname}.conf %dir %{_libdir}/%{ghcdir}/%{pkgname}-%{version} -%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/HSmmorph-%{version}.o -%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/libHSmmorph-%{version}.a +%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/libHSmmorph-%{version}-*.so +%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/libHSmmorph-%{version}-*.a +%exclude %{_libdir}/%{ghcdir}/%{pkgname}-%{version}/libHSmmorph-%{version}-*_p.a %dir %{_libdir}/%{ghcdir}/%{pkgname}-%{version}/Control %dir %{_libdir}/%{ghcdir}/%{pkgname}-%{version}/Control/Monad -%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/Control/Monad/Morph.hi +%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/Control/Monad/*.hi +%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/Control/Monad/*.dyn_hi +%dir %{_libdir}/%{ghcdir}/%{pkgname}-%{version}/Control/Monad/Trans +%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/Control/Monad/Trans/*.hi +%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/Control/Monad/Trans/*.dyn_hi %if %{with prof} %files prof %defattr(644,root,root,755) -%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/libHSmmorph-%{version}_p.a -%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/Control/Monad/Morph.p_hi +%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/libHSmmorph-%{version}-*_p.a +%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/Control/Monad/*.p_hi +%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/Control/Monad/Trans/*.p_hi %endif %files doc -- 2.44.0