From c86bd78fb9956f4fec47b5ac3158b8c5d349dabe Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sat, 8 Feb 2020 22:51:28 +0800 Subject: [PATCH] refresh to cabal-rpm-2.0.2 --- ghc-pem.spec | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/ghc-pem.spec b/ghc-pem.spec index 20ed600..0add0bb 100644 --- a/ghc-pem.spec +++ b/ghc-pem.spec @@ -1,14 +1,12 @@ -# generated by cabal-rpm-1.0.1 +# generated by cabal-rpm-2.0.2 # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name pem %global pkgver %{pkg_name}-%{version} -%bcond_with tests - Name: ghc-%{pkg_name} Version: 0.2.4 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Privacy Enhanced Mail (PEM) format reader and writer License: BSD @@ -24,13 +22,6 @@ BuildRequires: ghc-base-prof BuildRequires: ghc-basement-prof BuildRequires: ghc-bytestring-prof BuildRequires: ghc-memory-prof -%if %{with tests} -BuildRequires: ghc-HUnit-devel -BuildRequires: ghc-QuickCheck-devel -BuildRequires: ghc-test-framework-devel -BuildRequires: ghc-test-framework-hunit-devel -BuildRequires: ghc-test-framework-quickcheck2-devel -%endif # End cabal-rpm deps %description @@ -53,6 +44,7 @@ This package provides the Haskell %{pkg_name} library development files. %if %{with haddock} %package doc Summary: Haskell %{pkg_name} library documentation +BuildArch: noarch %description doc This package provides the Haskell %{pkg_name} library documentation. @@ -63,6 +55,7 @@ This package provides the Haskell %{pkg_name} library documentation. %package prof Summary: Haskell %{pkg_name} profiling library Requires: %{name}-devel%{?_isa} = %{version}-%{release} +Supplements: (%{name}-devel and ghc-prof) %description prof This package provides the Haskell %{pkg_name} profiling library. @@ -87,8 +80,14 @@ This package provides the Haskell %{pkg_name} profiling library. # End cabal-rpm install -%check -%cabal_test +%if 0%{?fedora} < 31 || 0%{?rhel} < 8 +%post devel +%ghc_pkg_recache + + +%postun devel +%ghc_pkg_recache +%endif %files -f %{name}.files @@ -102,6 +101,7 @@ This package provides the Haskell %{pkg_name} profiling library. %if %{with haddock} %files doc -f %{name}-doc.files +%license LICENSE %endif @@ -111,6 +111,9 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog +* Wed Feb 19 2020 Jens Petersen - 0.2.4-10 +- refresh to cabal-rpm-2.0.2 + * Tue Jan 28 2020 Fedora Release Engineering - 0.2.4-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild