- update from rpm-4_4_9 branch

[packages/rpm.git] / rpm-debuginfo.patch

diff --git a/rpm-debuginfo.patch b/rpm-debuginfo.patch
index a03bd5323695fc643752b0cc8d6d40207c6f270f..8ebb50a5a968b84787585aae108b8a646a23bf6f 100644 (file)
--- a/rpm-debuginfo.patch
+++ b/rpm-debuginfo.patch
@@ -45,9 +45,9 @@
      %{__arch_install_post}\
      %{__os_install_post}\
  %{nil}
---- rpm-4.5/scripts/find-debuginfo.sh~ 2008-06-10 01:31:33.274524622 +0300
-+++ rpm-4.5/scripts/find-debuginfo.sh  2008-05-22 14:11:01.000000000 +0300
-@@ -1,32 +1,50 @@
+--- rpm-4.5.debuginfo/scripts/find-debuginfo.sh        2007-08-31 04:07:02.000000000 +0300
++++ rpm-4.5/scripts/find-debuginfo.sh  2008-10-05 00:49:03.834523059 +0300
+@@ -1,36 +1,54 @@
  #!/bin/sh
 -#find-debuginfo.sh - automagically generate debug info and file list
 -#for inclusion in an rpm spec file.
@@ -115,3 +115,38 @@
 +      [ -f "$debugfn" ] && continue
  
        echo extracting debug info from $f
+-      /usr/lib/rpm/4.5/debugedit -b "$RPM_BUILD_DIR" -d /usr/src/debug -l "$SOURCEFILE" "$f"
++      /usr/lib/rpm/debugedit -b "$RPM_BUILD_DIR" -d /usr/src/debug -l "$SOURCEFILE" "$f"
+ 
+       # A binary already copied into /usr/lib/debug doesn't get stripped,
+       # just has its file names collected and adjusted.
+@@ -38,20 +56,21 @@
+       /usr/lib/debug/*) continue ;;
+       esac
+ 
+-      mkdir -p "${debugdn}"
++      mkdir -p "$debugdn"
+       if test -w "$f"; then
+-              strip_to_debug "${debugfn}" "$f"
++              strip_to_debug "$debugfn" "$f"
+       else
+               chmod u+w "$f"
+-              strip_to_debug "${debugfn}" "$f"
++              strip_to_debug "$debugfn" "$f"
+               chmod u-w "$f"
+       fi
+ done
+ 
+-mkdir -p ${RPM_BUILD_ROOT}/usr/src/debug
+-cat $SOURCEFILE | (cd $RPM_BUILD_DIR; LANG=C sort -z -u | cpio -pd0mL ${RPM_BUILD_ROOT}/usr/src/debug)
++mkdir -p $RPM_BUILD_ROOT/usr/src/debug
++cat $SOURCEFILE | (cd $RPM_BUILD_DIR; LANG=C sort -z -u | fgrep -zv '<built-in>' | cpio --quiet -pd0mL $RPM_BUILD_ROOT/usr/src/debug)
+ # stupid cpio creates new directories in mode 0700, fixup
+-find ${RPM_BUILD_ROOT}/usr/src/debug -type d -print0 | xargs -0 chmod a+rx
++find $RPM_BUILD_ROOT/usr/src/debug -type d -print0 | xargs -0 chmod a+rx
+ 
+-find ${RPM_BUILD_ROOT}/usr/lib/debug -type f | sed -n -e "s#^$RPM_BUILD_ROOT##p" > $LISTFILE
+-find ${RPM_BUILD_ROOT}/usr/src/debug -mindepth 1 -maxdepth 1 | sed -n -e "s#^$RPM_BUILD_ROOT##p" >> $LISTFILE
++find $RPM_BUILD_ROOT/usr/lib/debug -type f | sed -n -e "s#^$RPM_BUILD_ROOT##p" > $LISTFILE
++find $RPM_BUILD_ROOT/usr/lib/debug -mindepth 1 -type d | sed -n -e "s#^$RPM_BUILD_ROOT#%dir #p" >> $LISTFILE
++find $RPM_BUILD_ROOT/usr/src/debug -mindepth 1 -maxdepth 1 | sed -n -e "s#^$RPM_BUILD_ROOT##p" >> $LISTFILE