diff --git a/ghc-codec-rpm.spec b/ghc-codec-rpm.spec index 276cf71..2b147dc 100644 --- a/ghc-codec-rpm.spec +++ b/ghc-codec-rpm.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 codec-rpm %global pkgver %{pkg_name}-%{version} -%bcond_with tests - Name: ghc-%{pkg_name} Version: 0.2.2 -Release: 6%{?dist} +Release: 7%{?dist} Summary: A library for manipulating RPM files License: LGPLv2+ @@ -34,11 +32,6 @@ BuildRequires: ghc-parsec-prof BuildRequires: ghc-pretty-prof BuildRequires: ghc-resourcet-prof BuildRequires: ghc-text-prof -%if %{with tests} -BuildRequires: ghc-HUnit-devel -BuildRequires: ghc-hspec-devel -BuildRequires: ghc-hspec-attoparsec-devel -%endif # End cabal-rpm deps %description @@ -63,6 +56,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. @@ -73,6 +67,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. @@ -97,8 +92,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 @@ -113,6 +114,7 @@ This package provides the Haskell %{pkg_name} profiling library. %if %{with haddock} %files doc -f %{name}-doc.files +%license LICENSE %endif @@ -122,6 +124,9 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog +* Thu Feb 20 2020 Jens Petersen - 0.2.2-7 +- refresh to cabal-rpm-2.0.2 + * Tue Jan 28 2020 Fedora Release Engineering - 0.2.2-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild