BR ghc-rpm-macros 0.95.2 and check PACKAGES_DIR more carefully in RPATH
This commit is contained in:
parent
35ba98b0d1
commit
f432225203
@ -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@redhat.com> - 2011.4.0.741-2
|
||||
|
Loading…
Reference in New Issue
Block a user