From 4dc9c94fdf4303ac3acc7643a9fbca5c563cb227 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sat, 8 Feb 2020 22:49:27 +0800 Subject: [PATCH] refresh to cabal-rpm-2.0.2 --- ghc-colour.spec | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/ghc-colour.spec b/ghc-colour.spec index 6cd3fd2..06453f7 100644 --- a/ghc-colour.spec +++ b/ghc-colour.spec @@ -1,11 +1,9 @@ -# generated by cabal-rpm-1.0.1 +# generated by cabal-rpm-2.0.2 # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name colour %global pkgver %{pkg_name}-%{version} -%bcond_with tests - Name: ghc-%{pkg_name} Version: 2.3.5 Release: 2%{?dist} @@ -21,12 +19,6 @@ Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros BuildRequires: ghc-base-prof -%if %{with tests} -BuildRequires: ghc-QuickCheck-devel -BuildRequires: ghc-random-devel -BuildRequires: ghc-test-framework-devel -BuildRequires: ghc-test-framework-quickcheck2-devel -%endif # End cabal-rpm deps %description @@ -51,6 +43,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. @@ -61,6 +54,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 +81,14 @@ rm %{buildroot}%{_datadir}/%{pkgver}/{CHANGELOG,README} # 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 @@ rm %{buildroot}%{_datadir}/%{pkgver}/{CHANGELOG,README} %if %{with haddock} %files doc -f %{name}-doc.files +%license LICENSE %endif