Author: qboosh Date: Fri Jul 29 17:36:42 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- for .la symlinks generate libtool(symlink), not libtool(target) Provides
---- Files affected:
packages/rpm:
rpm-libtool-deps.patch (1.9 -> 1.10)
---- Diffs:
================================================================
Index: packages/rpm/rpm-libtool-deps.patch
diff -u packages/rpm/rpm-libtool-deps.patch:1.9
packages/rpm/rpm-libtool-deps.patch:1.10
--- packages/rpm/rpm-libtool-deps.patch:1.9 Wed May 21 12:26:42 2008
+++ packages/rpm/rpm-libtool-deps.patch Fri Jul 29 19:36:37 2011
@@ -1,6 +1,6 @@
--- rpm-4.4.8.org/scripts/libtooldeps.sh 2005-11-12 22:20:42.000000000
+0100
+++ rpm-4.4.8/scripts/libtooldeps.sh 2006-11-26 20:06:49.254008750 +0100
-@@ -5,15 +5,18 @@
+@@ -5,15 +5,17 @@
exit 0
}
@@ -10,18 +10,17 @@
-P|--provides)
shift
- RPM_BUILD_ROOT="$1"
-+ RPM_BUILD_ROOT="`readlink -f "$1"`"
++ RPM_BUILD_ROOT="$1"
while read possible
do
case "$possible" in
*.la)
- if grep -iq '^# Generated by ltmain.sh' "$possible" 2> /dev/null ;
then
-+ possible="`readlink -f "$possible" 2> /dev/null || echo
"$possible"`"
-+ if file "$possible" | grep -iq 'libtool library file' 2> /dev/null
; then
++ if file -L "$possible" | grep -iq 'libtool library file' 2>
/dev/null ; then
possible="`echo ${possible} | sed -e s,${RPM_BUILD_ROOT}/,/,`"
echo "libtool($possible)"
fi
-@@ -22,21 +25,28 @@
+@@ -22,21 +24,28 @@
done
;;
-R|--requires)
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rpm/rpm-libtool-deps.patch?r1=1.9&r2=1.10&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
