]> git.pld-linux.org Git - packages/rpm.git/commitdiff
This commit was manufactured by cvs2git to create tag 'auto-th-rpm- auto/th/rpm-4_4_6-1_20
authorcvs2git <feedback@pld-linux.org>
Mon, 27 Nov 2006 11:12:09 +0000 (11:12 +0000)
committercvs2git <feedback@pld-linux.org>
Sun, 24 Jun 2012 12:13:13 +0000 (12:13 +0000)
4_4_6-1_20'.

Sprout from rpm-4_4_6 2006-11-27 11:12:09 UTC Arkadiusz Miśkiewicz <arekm@maven.pl> '- rel 1.20'
Cherrypick from master 2006-11-27 11:08:50 UTC Arkadiusz Miśkiewicz <arekm@maven.pl> '- updated':
    rpm-libtool-deps.patch -> 1.3

rpm-libtool-deps.patch [new file with mode: 0644]

diff --git a/rpm-libtool-deps.patch b/rpm-libtool-deps.patch
new file mode 100644 (file)
index 0000000..6b6a861
--- /dev/null
@@ -0,0 +1,22 @@
+diff -urN rpm-4.4.6.org/scripts/libtooldeps.sh rpm-4.4.6/scripts/libtooldeps.sh
+--- rpm-4.4.6.org/scripts/libtooldeps.sh       2005-11-12 22:20:42.000000000 +0100
++++ rpm-4.4.6/scripts/libtooldeps.sh   2006-11-26 20:06:49.254008750 +0100
+@@ -13,7 +13,8 @@
+     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 ; the
+               possible="`echo ${possible} | sed -e s,${RPM_BUILD_ROOT}/,/,`"
+               echo "libtool($possible)"
+           fi
+@@ -30,6 +31,7 @@
+           do
+               case "$dep" in
+               /*.la)
++                  dep="`readlink -f "$dep" 2> /dev/null || echo "$dep"`"
+                   echo "libtool($dep)"
+                   ;;
+               esac
+
This page took 0.032984 seconds and 4 git commands to generate.