From a1ee36458e20f6be7c83bc2fa41d23ee5bbd58d7 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sat, 8 Feb 2020 22:48:37 +0800 Subject: [PATCH] refresh to cabal-rpm-2.0.2 --- ghc-HTTP.spec | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/ghc-HTTP.spec b/ghc-HTTP.spec index 557f1cc..09b982b 100644 --- a/ghc-HTTP.spec +++ b/ghc-HTTP.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 HTTP %global pkgver %{pkg_name}-%{version} -%bcond_with tests - Name: ghc-%{pkg_name} Version: 4000.3.14 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A library for client-side HTTP License: BSD @@ -28,15 +26,6 @@ BuildRequires: ghc-network-prof BuildRequires: ghc-network-uri-prof BuildRequires: ghc-parsec-prof BuildRequires: ghc-time-prof -%if %{with tests} -BuildRequires: ghc-HUnit-devel -BuildRequires: ghc-deepseq-devel -BuildRequires: ghc-httpd-shed-devel -BuildRequires: ghc-pureMD5-devel -BuildRequires: ghc-split-devel -BuildRequires: ghc-test-framework-devel -BuildRequires: ghc-test-framework-hunit-devel -%endif # End cabal-rpm deps %description @@ -74,6 +63,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. @@ -84,6 +74,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. @@ -108,8 +99,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 @@ -124,6 +121,7 @@ This package provides the Haskell %{pkg_name} profiling library. %if %{with haddock} %files doc -f %{name}-doc.files +%license LICENSE %endif @@ -133,6 +131,9 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog +* Wed Feb 19 2020 Jens Petersen - 4000.3.14-3 +- refresh to cabal-rpm-2.0.2 + * Tue Jan 28 2020 Fedora Release Engineering - 4000.3.14-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild