[haskell-platform] BR ghc-rpm-macros 0.95.2 and check PACKAGES_DIR more carefully in RPATH
Jens Petersen
petersen at fedoraproject.org
Fri Jun 8 05:32:24 UTC 2012
commit f432225203604856e8aec39d11af75c6c5525de7
Author: Jens Petersen <petersen at redhat.com>
Date: Fri Jun 8 14:32:18 2012 +0900
BR ghc-rpm-macros 0.95.2 and check PACKAGES_DIR more carefully in RPATH
haskell-platform.spec | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/haskell-platform.spec b/haskell-platform.spec
index ab67b8f..30743d5 100644
--- a/haskell-platform.spec
+++ b/haskell-platform.spec
@@ -23,7 +23,7 @@ URL: http://hackage.haskell.org/platform
Source0: http://lambda.haskell.org/platform/download/%{version}/%{name}-%{version}.tar.gz
ExclusiveArch: %{ghc_arches}
BuildRequires: ghc-Cabal-devel
-BuildRequires: ghc-rpm-macros >= 0.95.1, %{!?without_hscolour:hscolour}
+BuildRequires: ghc-rpm-macros >= 0.95.2, %{!?without_hscolour:hscolour}
# for fixing RPATH in the binary programs
BuildRequires: chrpath
# END cabal2spec
@@ -265,7 +265,7 @@ for i in alex cabal happy; do
PROG=%{buildroot}%{_bindir}/$i
RPATH=$(chrpath $PROG| sed -e "s!^$PROG: RPATH=!!")
case $RPATH in
- $PACKAGES_DIR*)
+ *$PACKAGES_DIR*)
NEWRPATH=$(echo $RPATH | sed -e "s!$PACKAGES_DIR!%{ghclibdir}!g" -e "s!/dist/build!!g")
chrpath -r $NEWRPATH $PROG
;;
@@ -327,7 +327,7 @@ done
- drop common_summary and common_description for subpackaging
- no longer need to unset debug_package
- make sure all the dynamically linked files get stripped
-- needs ghc-rpm-macros 0.95.1 or later to build
+- needs ghc-rpm-macros 0.95.2 or later to build
- use chrpath to fix the program RPATHs when dynamically linked to HP libs
* Wed May 9 2012 Jens Petersen <petersen at redhat.com> - 2011.4.0.741-2
More information about the scm-commits
mailing list