diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec index 0942bb9..c81153b 100644 --- a/ghc-rpm-macros.spec +++ b/ghc-rpm-macros.spec @@ -6,7 +6,7 @@ #%%global without_hscolour 1 Name: ghc-rpm-macros -Version: 1.4.4 +Version: 1.4.5 Release: 1%{?dist} Summary: RPM macros for building packages for GHC @@ -88,6 +88,9 @@ install -p -D -m 0755 %{SOURCE5} %{buildroot}/%{_bindir}/cabal-tweak-flag %changelog +* Sat Jan 31 2015 Jens Petersen - 1.4.5-1 +- fix the R*PATH regexp + * Sat Jan 31 2015 Jens Petersen - 1.4.4-1 - ghc_fix_dynamic_rpath: on ARMv7 RPATH is RUNPATH diff --git a/macros.ghc b/macros.ghc index 0b4b85f..bb7fa36 100644 --- a/macros.ghc +++ b/macros.ghc @@ -141,7 +141,7 @@ for i in %*; do\ *) PROG=%{buildroot}%{_bindir}/$i ;;\ esac\ if [ -x "$PROG" ]; then\ - RPATH=$(chrpath $PROG | sed -e "s@^$PROG: RU\?N\?PATH=@@")\ + RPATH=$(chrpath $PROG | sed -e "s@^$PROG: R.*PATH=@@")\ case $RPATH in\ *$PDIR*)\ NEWRPATH=$(echo $RPATH | sed -e "s@$PDIR/dist/build@%{ghclibdir}/%{pkg_name}-%{version}@g")\