From a3fda09b9bae7692d2e0f5379f7e19302ebaa57e Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Jul 25 2019 06:38:44 +0000 Subject: refresh to cabal-rpm-1.0.0: lib doc/prof subpkgs and bin static BRs --- diff --git a/ghc-servant.spec b/ghc-servant.spec index 69af6e1..4392a71 100644 --- a/ghc-servant.spec +++ b/ghc-servant.spec @@ -1,4 +1,4 @@ -# generated by cabal-rpm-0.13 +# generated by cabal-rpm-1.0.0 --subpackage # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name servant @@ -25,12 +25,19 @@ Source2: https://hackage.haskell.org/package/%{pkgver}/%{pkg_name}.cabal# # Begin cabal-rpm deps: BuildRequires: ghc-Cabal-devel +BuildRequires: ghc-cabal-doctest-devel +%if %{with haddock} +BuildRequires: ghc-doc +%endif +%if %{with ghc_prof} +BuildRequires: ghc-prof +%endif BuildRequires: ghc-rpm-macros-extra +BuildRequires: chrpath BuildRequires: ghc-aeson-devel BuildRequires: ghc-attoparsec-devel BuildRequires: ghc-base-compat-devel BuildRequires: ghc-bytestring-devel -BuildRequires: ghc-cabal-doctest-devel BuildRequires: ghc-case-insensitive-devel BuildRequires: ghc-http-api-data-devel BuildRequires: ghc-http-media-devel @@ -67,23 +74,32 @@ CHANGELOG>. %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} %description devel This package provides the Haskell %{pkg_name} library development files. -%package devel-doc -Summary: Haskell %{pkg_name} library development documentation -BuildArch: noarch -%description devel-doc -This package provides the Haskell %{pkg_name} development documentation. +%if %{with haddock} +%package doc +Summary: Haskell %{pkg_name} library 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 %global main_version %{version} @@ -113,39 +129,34 @@ cp -bp %{SOURCE2} %{pkg_name}.cabal # Begin cabal-rpm install %ghc_libs_install %{subpkgs} %ghc_lib_install +%ghc_fix_rpath %{pkgver} # 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 -%if %{undefined without_haddock} -%files devel-doc -f %{name}-devel-doc.files -%doc CHANGELOG.md + +%if %{with haddock} +%files doc -f %{name}-doc.files %endif + +%if %{with ghc_prof} +%files prof -f %{name}-prof.files +%endif + + %changelog * Thu Jul 25 2019 Fedora Release Engineering - 0.14.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild