RPM Package Manager, CVS Repository http://rpm5.org/cvs/ ____________________________________________________________________________
Server: rpm5.org Name: Elan Ruusamäe Root: /v/rpm/cvs Email: [email protected] Module: rpm Date: 17-Oct-2009 13:49:58 Branch: rpm-4_5 Handle: 2009101711495701 Modified files: (Branch: rpm-4_5) rpm CHANGES rpm/scripts libtooldeps.sh Log: - libtool deps generator update from PLD Linux Summary: Revision Changes Path 1.1360.2.138+1 -0 rpm/CHANGES 1.2.2.1 +25 -15 rpm/scripts/libtooldeps.sh ____________________________________________________________________________ patch -p0 <<'@@ .' Index: rpm/CHANGES ============================================================================ $ cvs diff -u -r1.1360.2.137 -r1.1360.2.138 CHANGES --- rpm/CHANGES 17 Oct 2009 11:48:31 -0000 1.1360.2.137 +++ rpm/CHANGES 17 Oct 2009 11:49:57 -0000 1.1360.2.138 @@ -1,4 +1,5 @@ 4.4.9 -> 4.5: + - glen: libtool deps generator update from PLD Linux - glen: ignore loop messages for pkgs in whiteout lists on erase too - glen: gendiff it uses bash syntax, maybe should be rewritten (bl...@pld). - glen: merge from HEAD: Check-in [10777]: add %{_check_symlink_deps} & %{_check_dirname_deps} to optionally enable/disable directory & symlink dependencies. By pkarlsen. @@ . patch -p0 <<'@@ .' Index: rpm/scripts/libtooldeps.sh ============================================================================ $ cvs diff -u -r1.2 -r1.2.2.1 libtooldeps.sh --- rpm/scripts/libtooldeps.sh 25 May 2007 18:34:16 -0000 1.2 +++ rpm/scripts/libtooldeps.sh 17 Oct 2009 11:49:58 -0000 1.2.2.1 @@ -5,15 +5,18 @@ exit 0 } +pkgname="$3" + case $1 in -P|--provides) shift - RPM_BUILD_ROOT="$1" + RPM_BUILD_ROOT="`readlink -f "$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 possible="`echo ${possible} | sed -e s,${RPM_BUILD_ROOT}/,/,`" echo "libtool($possible)" fi @@ -22,21 +25,28 @@ done ;; -R|--requires) - while read possible ; do - case "$possible" in - *.la) - for dep in `grep '^dependency_libs='"$possible" 2> /dev/null | \ - sed -e "s,^dependency_libs='\(.*\)',\1,g"` - do - case "$dep" in - /*.la) - echo "libtool($dep)" + case $pkgname in + *-devel) + while read possible ; do + case "$possible" in + *.la) + for dep in `grep '^dependency_libs=' "$possible" 2> /dev/null | \ + sed -e "s,^dependency_libs='\(.*\)',\1,g"` + do + case "$dep" in + /*.la) + dep="`readlink -f "$dep" 2> /dev/null || echo "$dep"`" + echo "libtool($dep)" + ;; + esac + done ;; esac done - ;; - esac - done - ;; + ;; + *) + cat > /dev/null + ;; + esac esac exit 0 @@ . ______________________________________________________________________ RPM Package Manager http://rpm5.org CVS Sources Repository [email protected]
