SOURCES (rpm-4_5): rpm-debuginfo.patch - update from rpm-4_4_9 branch

[glen]

Author: glen                         Date: Sat Oct  4 21:57:06 2008 GMT
Module: SOURCES                       Tag: rpm-4_5
---- Log message:
- update from rpm-4_4_9 branch

---- Files affected:
SOURCES:
   rpm-debuginfo.patch (1.15.6.7.2.3 -> 1.15.6.7.2.4) 

---- Diffs:

================================================================
Index: SOURCES/rpm-debuginfo.patch
diff -u SOURCES/rpm-debuginfo.patch:1.15.6.7.2.3 SOURCES/rpm-debuginfo.patch:1.15.6.7.2.4
--- SOURCES/rpm-debuginfo.patch:1.15.6.7.2.3	Wed Aug 27 20:35:28 2008
+++ SOURCES/rpm-debuginfo.patch	Sat Oct  4 23:57:00 2008
@@ -45,9 +45,9 @@
      %{__arch_install_post}\
      %{__os_install_post}\
  %{nil}
---- rpm-4.5/scripts/find-debuginfo.sh	2008-05-22 14:11:01.000000000 +0300
-+++ rpm-4.5/scripts/find-debuginfo.sh	2008-08-27 21:28:20.669206923 +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,12 +115,38 @@
 +	[ -f "$debugfn" ] && continue
  
  	echo extracting debug info from $f
-@@ -37,7 +55,7 @@
- 	[ -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
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/rpm-debuginfo.patch?r1=1.15.6.7.2.3&r2=1.15.6.7.2.4&f=u