From e7c465ff857177bbf9a7ddeac57ff5c9e0bfee74 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 6 Feb 2020 23:02:35 +0800 Subject: [PATCH] refresh to cabal-rpm-2.0.2 --- ghc-cryptonite.spec | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/ghc-cryptonite.spec b/ghc-cryptonite.spec index 341edff..35b796c 100644 --- a/ghc-cryptonite.spec +++ b/ghc-cryptonite.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 cryptonite %global pkgver %{pkg_name}-%{version} -%bcond_with tests +%bcond_without tests Name: ghc-%{pkg_name} Version: 0.25 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Cryptography Primitives sink # Main - Argon2 C code - Blake2 C code @@ -84,6 +84,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 @@ -95,6 +96,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. @@ -123,6 +125,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 @@ -135,6 +147,7 @@ This package provides the Haskell %{pkg_name} profiling library. %if %{with haddock} %files doc -f %{name}-doc.files +%license LICENSE %endif @@ -144,6 +157,9 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog +* Wed Feb 19 2020 Jens Petersen - 0.25-7 +- refresh to cabal-rpm-2.0.2 + * Tue Jan 28 2020 Fedora Release Engineering - 0.25-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild