From b8cd891b7790fa12b887698926c57fb533e789ac Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 19 Jul 2022 14:53:06 +0800 Subject: [PATCH] in F37 ghc-filesystem is now a subpackage of ghc --- ghc-rpm-macros.spec | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec index bdccb33..14d8ae7 100644 --- a/ghc-rpm-macros.spec +++ b/ghc-rpm-macros.spec @@ -7,7 +7,7 @@ %endif Name: ghc-rpm-macros -Version: 2.4.2 +Version: 2.4.3 Release: 1%{?dist} Summary: RPM macros for building Haskell packages for GHC @@ -46,12 +46,14 @@ Extra macros used for subpackaging of Haskell libraries, for example in ghc and haskell-platform. +%if 0%{?fedora} < 37 %package -n ghc-filesystem Summary: Shared directories for Haskell documentation %description -n ghc-filesystem This package provides some common directories used for Haskell libraries documentation. +%endif # ideally packages should be obsoleted by some relevant package @@ -139,7 +141,9 @@ install -p -D -m 0755 %{SOURCE11} %{buildroot}%{_bindir}/cabal-tweak-drop-dep install -p -D -m 0755 %{SOURCE12} %{buildroot}%{_bindir}/cabal-tweak-remove-upperbound install -p -D -m 0755 %{SOURCE8} %{buildroot}%{_prefix}/lib/rpm/ghc-pkg-wrapper +%if 0%{?fedora} < 37 mkdir -p %{buildroot}%{_docdir}/ghc/html/libraries +%endif %if 0%{?rhel} && 0%{?rhel} < 7 cat >> %{buildroot}%{_prefix}/lib/rpm/ghc-deps.sh <= 29 @@ -183,6 +190,9 @@ EOF %changelog +* Tue Jul 19 2022 Jens Petersen - 2.4.3-1 +- in F37 ghc-filesystem is now a subpackage of ghc + * Tue Jul 19 2022 Jens Petersen - 2.4.2-1 - ghc_bin_build,ghc_lib_build: define ghc_debuginfo to really enable debuginfo