diff --git a/ghc-sandi.spec b/ghc-sandi.spec index 03c1e02..c6223ff 100644 --- a/ghc-sandi.spec +++ b/ghc-sandi.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 sandi %global pkgver %{pkg_name}-%{version} -%bcond_with tests - Name: ghc-%{pkg_name} Version: 0.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Data encoding library License: BSD @@ -25,12 +23,6 @@ BuildRequires: ghc-base-prof BuildRequires: ghc-bytestring-prof BuildRequires: ghc-conduit-prof BuildRequires: ghc-exceptions-prof -%if %{with tests} -BuildRequires: ghc-tasty-devel -BuildRequires: ghc-tasty-hunit-devel -BuildRequires: ghc-tasty-quickcheck-devel -BuildRequires: ghc-tasty-th-devel -%endif # End cabal-rpm deps %description @@ -53,6 +45,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 +56,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. @@ -88,8 +82,14 @@ cp -bp %{SOURCE1} %{pkg_name}.cabal # 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 @@ -103,6 +103,7 @@ cp -bp %{SOURCE1} %{pkg_name}.cabal %if %{with haddock} %files doc -f %{name}-doc.files +%license LICENSE %endif @@ -112,6 +113,9 @@ cp -bp %{SOURCE1} %{pkg_name}.cabal %changelog +* Thu Feb 20 2020 Jens Petersen - 0.5-3 +- refresh to cabal-rpm-2.0.2 + * Tue Jan 28 2020 Fedora Release Engineering - 0.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild