From 14a65baa2a96de729e6fd92b968e1b0c1d5d1fe7 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Feb 24 2019 05:53:26 +0000 Subject: %ghc_fix_rpath was a no-op for ghc_without_dynamic --- diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec index 0883607..820bfc5 100644 --- a/ghc-rpm-macros.spec +++ b/ghc-rpm-macros.spec @@ -10,7 +10,7 @@ #%%global without_hscolour 1 Name: ghc-rpm-macros -Version: 1.9.6 +Version: 1.9.7 Release: 1%{?dist} Summary: RPM macros for building Haskell packages for GHC @@ -175,6 +175,9 @@ EOF %changelog +* Sun Feb 24 2019 Jens Petersen - 1.9.7-1 +- ghc_fix_rpath was a noop when ghc_without_dynamic + * Fri Feb 1 2019 Jens Petersen - 1.9.6-1 - disable debuginfo by undefining _enable_debug_packages - leave stripping to generic rpm macros diff --git a/macros.ghc b/macros.ghc index 5719d85..1655064 100644 --- a/macros.ghc +++ b/macros.ghc @@ -169,7 +169,6 @@ fi\ # ghc_fix_rpath lib-ver ... %ghc_fix_rpath()\ -%if %{undefined ghc_without_dynamic}\ if ! type chrpath > /dev/null; then exit 1; fi\ for i in $(find %{buildroot} -type f -exec sh -c "file {} | grep -q 'dynamically linked'" \\; -print); do\ for lib in %*; do\ @@ -197,7 +196,6 @@ for lib in %*; do\ fi\ done\ done\ -%endif\ %{nil} # Deprecated by ghc_fix_rpath: