From 850cf1ef55a066aef09ebea614b0ae05f41ccef0 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sat, 8 Feb 2020 22:50:47 +0800 Subject: [PATCH] refresh to cabal-rpm-2.0.2 --- ghc-io-streams.spec | 34 ++++++++++++++++------------------ 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/ghc-io-streams.spec b/ghc-io-streams.spec index e1a35e6..00f1d76 100644 --- a/ghc-io-streams.spec +++ b/ghc-io-streams.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 io-streams %global pkgver %{pkg_name}-%{version} -%bcond_with tests - Name: ghc-%{pkg_name} Version: 1.5.1.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Simple, composable, easy-to-use stream I/O License: BSD @@ -31,18 +29,6 @@ BuildRequires: ghc-time-prof BuildRequires: ghc-transformers-prof BuildRequires: ghc-vector-prof BuildRequires: ghc-zlib-bindings-prof -%if %{with tests} -BuildRequires: ghc-HUnit-devel -BuildRequires: ghc-QuickCheck-devel -BuildRequires: ghc-deepseq-devel -BuildRequires: ghc-directory-devel -BuildRequires: ghc-filepath-devel -BuildRequires: ghc-mtl-devel -BuildRequires: ghc-test-framework-devel -BuildRequires: ghc-test-framework-hunit-devel -BuildRequires: ghc-test-framework-quickcheck2-devel -BuildRequires: ghc-zlib-devel -%endif # End cabal-rpm deps %description @@ -80,6 +66,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. @@ -90,6 +77,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. @@ -116,8 +104,14 @@ cabal-tweak-drop-dep bytestring-builder # 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 @@ -132,6 +126,7 @@ cabal-tweak-drop-dep bytestring-builder %if %{with haddock} %files doc -f %{name}-doc.files +%license LICENSE %endif @@ -141,6 +136,9 @@ cabal-tweak-drop-dep bytestring-builder %changelog +* Thu Feb 20 2020 Jens Petersen - 1.5.1.0-3 +- refresh to cabal-rpm-2.0.2 + * Tue Jan 28 2020 Fedora Release Engineering - 1.5.1.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild