SOURCES (AC-branch): rpm-debuginfo.patch, rpm.macros - rpm-debugin...

[glen]

Author: glen                         Date: Fri Oct 28 20:44:26 2005 GMT
Module: SOURCES                       Tag: AC-branch
---- Log message:
- rpm-debuginfo.patch portion that modified rpm.macros moved to rpm.macros

---- Files affected:
SOURCES:
   rpm-debuginfo.patch (1.10.2.1 -> 1.10.2.2) , rpm.macros (1.158.4.77 -> 1.158.4.78) 

---- Diffs:

================================================================
Index: SOURCES/rpm-debuginfo.patch
diff -u SOURCES/rpm-debuginfo.patch:1.10.2.1 SOURCES/rpm-debuginfo.patch:1.10.2.2
--- SOURCES/rpm-debuginfo.patch:1.10.2.1	Mon Aug 15 20:29:46 2005
+++ SOURCES/rpm-debuginfo.patch	Fri Oct 28 22:44:20 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 @@

================================================================
Index: SOURCES/rpm.macros
diff -u SOURCES/rpm.macros:1.158.4.77 SOURCES/rpm.macros:1.158.4.78
--- SOURCES/rpm.macros:1.158.4.77	Fri Oct 28 22:41:47 2005
+++ SOURCES/rpm.macros	Fri Oct 28 22:44:21 2005
@@ -125,7 +125,10 @@
 unset LINGUAS ||:\
 %{nil}
 
-%install %{?_enable_debug_packages:%{?buildsubdir:%{debug_package}}}\
+%install \
+%if 0%{?_enable_debug_packages}\
+%{?buildsubdir:%{debug_package}}\
+%endif\
 %%install\
 LANG=C\
 export LANG\
@@ -289,7 +292,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 | \
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/rpm-debuginfo.patch?r1=1.10.2.1&r2=1.10.2.2&f=u
    http://cvs.pld-linux.org/SOURCES/rpm.macros?r1=1.158.4.77&r2=1.158.4.78&f=u