diff --git a/ghc-rpm-macros.ghc b/ghc-rpm-macros.ghc index 8eae438..0cf0f8b 100644 --- a/ghc-rpm-macros.ghc +++ b/ghc-rpm-macros.ghc @@ -135,6 +135,7 @@ fi # ghc_fix_dynamic_rpath prog ... %ghc_fix_dynamic_rpath()\ %if %{undefined ghc_without_dynamic}\ +if ! type chrpath > /dev/null; then exit 1; fi\ PDIR=$(cd ..; pwd)\ for i in %*; do\ PROG=%{buildroot}%{_bindir}/$i\ diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec index 27636d1..f39fca6 100644 --- a/ghc-rpm-macros.spec +++ b/ghc-rpm-macros.spec @@ -6,8 +6,8 @@ #%%global without_hscolour 1 Name: ghc-rpm-macros -Version: 1.2.3 -Release: 2%{?dist} +Version: 1.2.4 +Release: 1%{?dist} Summary: RPM macros for building packages for GHC License: GPLv3 @@ -90,6 +90,9 @@ EOF %changelog +* Mon Mar 17 2014 Jens Petersen - 1.2.4-1 +- abort ghc_fix_dynamic_rpath if no chrpath + * Thu Feb 13 2014 Ville Skyttä - 1.2.3-2 - Install macros to %%{_rpmconfigdir}/macros.d.