From 148398e16433c4aa58c630c32deea3616b91452f Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 25 Jul 2019 04:22:30 +0000 Subject: [PATCH] cabal-rpm-1.0.0: add doc and prof subpkgs --- ghc-cryptonite.spec | 62 ++++++++++++++++++++++++++------------------- 1 file changed, 36 insertions(+), 26 deletions(-) diff --git a/ghc-cryptonite.spec b/ghc-cryptonite.spec index e86a12c..6cbc33c 100644 --- a/ghc-cryptonite.spec +++ b/ghc-cryptonite.spec @@ -1,4 +1,4 @@ -# generated by cabal-rpm-0.13 +# generated by cabal-rpm-1.0.0 # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name cryptonite @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 0.25 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Cryptography Primitives sink # Main - Argon2 C code - Blake2 C code @@ -20,6 +20,12 @@ Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz # Begin cabal-rpm deps: BuildRequires: ghc-Cabal-devel +%if %{with haddock} +BuildRequires: ghc-doc +%endif +%if %{with ghc_prof} +BuildRequires: ghc-prof +%endif BuildRequires: ghc-rpm-macros BuildRequires: ghc-basement-devel BuildRequires: ghc-bytestring-devel @@ -67,11 +73,8 @@ Read "Crypto.Tutorial" for a quick start guide. %package devel Summary: Haskell %{pkg_name} library development files Provides: %{name}-static = %{version}-%{release} -Provides: %{name}-doc = %{version}-%{release} %if %{defined ghc_version} Requires: ghc-compiler = %{ghc_version} -Requires(post): ghc-compiler = %{ghc_version} -Requires(postun): ghc-compiler = %{ghc_version} %endif Requires: %{name}%{?_isa} = %{version}-%{release} # Begin cabal-rpm deps: @@ -82,12 +85,24 @@ Requires: glibc-devel%{?_isa} This package provides the Haskell %{pkg_name} library development files. -%package devel-doc -Summary: Haskell %{pkg_name} library development documentation +%if %{with haddock} +%package doc +Summary: Haskell %{pkg_name} library documentation +Obsoletes: %{name}-devel-doc < %{version}-%{release} -%description devel-doc -This package provides the Haskell %{pkg_name} library development -documentation. +%description doc +This package provides the Haskell %{pkg_name} library documentation. +%endif + + +%if %{with ghc_prof} +%package prof +Summary: Haskell %{pkg_name} profiling library +Requires: %{name}-devel%{?_isa} = %{version}-%{release} + +%description prof +This package provides the Haskell %{pkg_name} profiling library. +%endif %prep @@ -106,41 +121,36 @@ documentation. # Begin cabal-rpm install %ghc_lib_install # End cabal-rpm install -grep -v "%{_docdir}/ghc/html/libraries/%{pkgver}" %{name}-devel.files > %{name}-devel-nodoc.files -%if %{undefined without_haddock} -grep "%{_docdir}/ghc/html/libraries/%{pkgver}" %{name}-devel.files > %{name}-devel-doc.files -%endif %check %cabal_test -%post devel -%ghc_pkg_recache - - -%postun devel -%ghc_pkg_recache - - %files -f %{name}.files # Begin cabal-rpm files: %license LICENSE # End cabal-rpm files -%files devel -f %{name}-devel-nodoc.files +%files devel -f %{name}-devel.files %doc CHANGELOG.md README.md -%if %{undefined without_haddock} -%files devel-doc -f %{name}-devel-doc.files -%doc CHANGELOG.md README.md +%if %{with haddock} +%files doc -f %{name}-doc.files +%endif + + +%if %{with ghc_prof} +%files prof -f %{name}-prof.files %endif %changelog +* Thu Aug 01 2019 Jens Petersen - 0.25-5 +- add doc and prof subpackages (cabal-rpm-1.0.0) + * Thu Jul 25 2019 Fedora Release Engineering - 0.25-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild