diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec index 67d41bf..ecf4d2d 100644 --- a/ghc-rpm-macros.spec +++ b/ghc-rpm-macros.spec @@ -7,8 +7,8 @@ %endif Name: ghc-rpm-macros -Version: 2.7.1 -Release: 2%{?dist} +Version: 2.7.2 +Release: 1%{?dist} Summary: RPM macros for building Haskell packages for GHC License: GPL-3.0-or-later @@ -205,6 +205,9 @@ mkdir -p %{buildroot}%{_docdir}/ghc/html/libraries %changelog +* Mon Jul 29 2024 Jens Petersen - 2.7.2-1 +- extra: add ghc_merge_filelist from ghc.spec + * Thu Jul 18 2024 Fedora Release Engineering - 2.7.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild diff --git a/macros.ghc-extra b/macros.ghc-extra index 34f45f5..33dd305 100644 --- a/macros.ghc-extra +++ b/macros.ghc-extra @@ -123,3 +123,19 @@ ver=$(echo $i | sed -e "s/.*-\\(.*\\)/\\1/")\ cd ..\ done\ %{nil} + +# ghc_merge_filelist lib base +%ghc_merge_filelist()\ +cat %{name}-%1.files >> %{name}-%2.files\ +cat %{name}-%1-devel.files >> %{name}-%2-devel.files\ +%if %{with haddock}\ +cat %{name}-%1-doc.files >> %{name}-%2-doc.files\ +%endif\ +%if %{with ghc_prof}\ +cat %{name}-%1-prof.files >> %{name}-%2-prof.files\ +%endif\ +if [ "%1" != "rts" ]; then\ +cp -p libraries/%1/LICENSE libraries/LICENSE.%1\ +echo "%%license libraries/LICENSE.%1" >> %{name}-%2.files\ +fi\ +%{nil}