From 1811c9b9b435f8164f1bbeee2c88ea850de2800a Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 6 Feb 2020 23:04:22 +0800 Subject: [PATCH] refresh to cabal-rpm-2.0.2 --- ghc-hourglass.spec | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/ghc-hourglass.spec b/ghc-hourglass.spec index 7b82b31..aadbd7d 100644 --- a/ghc-hourglass.spec +++ b/ghc-hourglass.spec @@ -1,14 +1,14 @@ -# generated by cabal-rpm-1.0.1 +# generated by cabal-rpm-2.0.2 # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name hourglass %global pkgver %{pkg_name}-%{version} -%bcond_with tests +%bcond_without tests Name: ghc-%{pkg_name} Version: 0.2.12 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Simple performant time related library License: BSD @@ -57,6 +57,7 @@ This package provides the Haskell %{pkg_name} library development files. %if %{with haddock} %package doc Summary: Haskell %{pkg_name} library documentation +BuildArch: noarch Obsoletes: %{name}-devel-doc < %{version}-%{release} %description doc @@ -68,6 +69,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. @@ -96,6 +98,16 @@ This package provides the Haskell %{pkg_name} profiling library. %cabal_test +%if 0%{?fedora} < 31 || 0%{?rhel} < 8 +%post devel +%ghc_pkg_recache + + +%postun devel +%ghc_pkg_recache +%endif + + %files -f %{name}.files # Begin cabal-rpm files: %license LICENSE @@ -108,6 +120,7 @@ This package provides the Haskell %{pkg_name} profiling library. %if %{with haddock} %files doc -f %{name}-doc.files +%license LICENSE %endif @@ -117,6 +130,9 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog +* Wed Feb 19 2020 Jens Petersen - 0.2.12-5 +- refresh to cabal-rpm-2.0.2 + * Tue Jan 28 2020 Fedora Release Engineering - 0.2.12-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild