SOURCES: rpm-debuginfo.patch - merged from AC-branch

[wolf]

Author: wolf                         Date: Mon Oct 31 12:04:50 2005 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- merged from AC-branch

---- Files affected:
SOURCES:
   rpm-debuginfo.patch (1.11 -> 1.12) 

---- Diffs:

================================================================
Index: SOURCES/rpm-debuginfo.patch
diff -u SOURCES/rpm-debuginfo.patch:1.11 SOURCES/rpm-debuginfo.patch:1.12
--- SOURCES/rpm-debuginfo.patch:1.11	Sat Jul 23 13:49:37 2005
+++ SOURCES/rpm-debuginfo.patch	Mon Oct 31 13:04:44 2005
@@ -34,27 +34,6 @@
  %{__arch_install_post}\
  %{__os_install_post}\
  %{nil}
-@@ -1250,7 +1250,10 @@
- unset DISPLAY ||:\
- %{nil}
- 
--%install %{?_enable_debug_packages:%{?buildsubdir:%{debug_package}}}\
-+%install \
-+%if 0%{?_enable_debug_packages}\
-+%{?buildsubdir:%{debug_package}}\
-+%endif\
- %%install\
- LANG=C\
- export LANG\
-@@ -1407,7 +1410,7 @@
-     %{?verbose:set -x;} \
-     if [ -d "$RPM_BUILD_ROOT" ]; then \
- 	echo "Strip executable binaries, archives and shared object files."; \
--	filelist=`find $RPM_BUILD_ROOT -type f ! -regex ".*ld-[0-9.]*so.*" %{?_noautostrip:! -regex "%{_noautostrip}"}`; \
-+	filelist=`find $RPM_BUILD_ROOT -type f ! -regex ".*ld-[0-9.]*so.*" ! -regex ".*/usr/lib[0-9]*/debug/.*\.debug" %{?_noautostrip:! -regex "%{_noautostrip}"}`; \
- 	elfexelist=`echo $filelist | xargs -r file | \
- 		awk '/ELF.*executable/ {print $1}' | cut -d: -f1`; \
- 	elfsharedlist=`echo $filelist | xargs -r file | \
 --- rpm-4.4.2/scripts/find-debuginfo.sh.orig	2005-07-14 17:52:31.000000000 +0200
 +++ rpm-4.4.2/scripts/find-debuginfo.sh	2005-07-23 13:57:04.542906944 +0200
 @@ -25,7 +25,7 @@
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/rpm-debuginfo.patch?r1=1.11&r2=1.12&f=u