From a1c1188a5201ac4fe48755d8bc9cd6eb41e6e57e Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 8 Jun 2021 00:05:38 +0800 Subject: [PATCH] ghc-rpm-macros needs to require chrpath now --- ghc-rpm-macros.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec index 25e5491..7f4e2c2 100644 --- a/ghc-rpm-macros.spec +++ b/ghc-rpm-macros.spec @@ -10,7 +10,7 @@ #%%global without_hscolour 1 Name: ghc-rpm-macros -Version: 2.2.0 +Version: 2.2.1 Release: 1%{?dist} Summary: RPM macros for building Haskell packages for GHC @@ -33,6 +33,7 @@ Source12: cabal-tweak-remove-upperbound Requires: redhat-rpm-config # for ghc_version Requires: ghc-compiler +Requires: chrpath %if %{undefined without_hscolour} Requires: hscolour %endif @@ -46,7 +47,6 @@ of the Fedora Haskell SIG. %package extra Summary: Extra RPM macros for building Haskell library subpackages Requires: %{name} = %{version}-%{release} -Requires: chrpath %description extra Extra macros used for subpackaging of Haskell libraries, @@ -190,6 +190,9 @@ EOF %changelog +* Tue Jun 8 2021 Jens Petersen - 2.2.1-1 +- ghc-rpm-macros needs to require chrpath now instead of ghc-rpm-macros-extra + * Mon Jun 7 2021 Jens Petersen - 2.2.0-1 - ghc_delete_rpaths macro replaces ghc_fix_rpath(), needed for https://fedoraproject.org/wiki/Changes/Broken_RPATH_will_fail_rpmbuild