rpms/rpm/devel find-debuginfo.sh,1.2,1.3 rpm.spec,1.248,1.249

[Panu Matilainen (pmatilai)]

Author: pmatilai

Update of /cvs/pkgs/rpms/rpm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3820

Modified Files:
	find-debuginfo.sh rpm.spec 
Log Message:
- updated find-debuginfo from Roland



Index: find-debuginfo.sh
===================================================================
RCS file: /cvs/pkgs/rpms/rpm/devel/find-debuginfo.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- find-debuginfo.sh	9 Aug 2007 07:08:36 -0000	1.2
+++ find-debuginfo.sh	14 Aug 2007 07:44:23 -0000	1.3
@@ -93,7 +93,7 @@
   $strip_g && case "$(file -bi "$2")" in
   application/x-sharedlib,*) g=-g ;;
   esac
-  eu-strip --remove-comment -f "$1" "$2" || exit
+  eu-strip --remove-comment $g -f "$1" "$2" || exit
 }
 
 # Make a relative symlink to $1 called $3$2
@@ -254,13 +254,10 @@
 fi
 
 if [ -d ${RPM_BUILD_ROOT}/usr/lib -o -d ${RPM_BUILD_ROOT}/usr/src ]; then
-  gendirs=src
-  ((nout > 0)) || gendirs='lib src'
-  for d in $gendirs; do
-    test ! -d ${RPM_BUILD_ROOT}/usr/$d ||
-    (cd ${RPM_BUILD_ROOT}/usr/$d; find debug -type d) |
-    sed "s,^,%dir /usr/$d/," >> $LISTFILE
-  done
+  ((nout > 0)) ||
+  test ! -d ${RPM_BUILD_ROOT}/usr/lib ||
+  (cd ${RPM_BUILD_ROOT}/usr/lib; find debug -type d) |
+  sed 's,^,%dir /usr/lib/,' >> $LISTFILE
 
   (cd ${RPM_BUILD_ROOT}/usr
    test ! -d lib/debug || find lib/debug ! -type d
@@ -324,7 +321,7 @@
 done
 if ((nout > 0)); then
   # Now add the right %dir lines to each output list.
-  (cd ${RPM_BUILD_ROOT}; find usr/{lib,src}/debug -type d) |
+  (cd ${RPM_BUILD_ROOT}; find usr/lib/debug -type d) |
   sed 's#^.*$#\\@^/&/@{h;s@^.*$@%dir /&@p;g;}#' |
   LC_ALL=C sort -ur > ${LISTFILE}.dirs.sed
   i=0


Index: rpm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpm/devel/rpm.spec,v
retrieving revision 1.248
retrieving revision 1.249
diff -u -r1.248 -r1.249
--- rpm.spec	14 Aug 2007 07:36:42 -0000	1.248
+++ rpm.spec	14 Aug 2007 07:44:23 -0000	1.249
@@ -474,7 +474,7 @@
 
 %changelog
 * Mon Aug 13 2007 Panu Matilainen <pmatilai at redhat.com> - 4.4.2.1-7
-- another debugedit fix from Roland McGrath
+- another debugedit fix and updated find-debuginfo script from Roland McGrath
 - make popt provide popt-devel to further ease split-off transition
 - skip ESTALE and EACCESS on mountpoints from Jeff Johnson (#190496, #220991)