SOURCES: rpm.macros - do not look into docdir for chrpath and stri...

[glen]

Author: glen                         Date: Tue Dec 26 21:29:55 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- do not look into docdir for chrpath and strip files

---- Files affected:
SOURCES:
   rpm.macros (1.358 -> 1.359) 

---- Diffs:

================================================================
Index: SOURCES/rpm.macros
diff -u SOURCES/rpm.macros:1.358 SOURCES/rpm.macros:1.359
--- SOURCES/rpm.macros:1.358	Tue Dec 26 22:29:01 2006
+++ SOURCES/rpm.macros	Tue Dec 26 22:29:50 2006
@@ -350,7 +350,7 @@
 %__spec_install_post_strip {%{!?debug: \
 %{!?no_install_post_strip:__spec_install_post_strip() { \
 if [ -d "$RPM_BUILD_ROOT" ]; then \
-	filelist=`find $RPM_BUILD_ROOT -type f ! -regex ".*ld-[0-9.]*so.*" ! -regex ".*/usr/lib[0-9]*/debug/.*\.debug" %{?_noautostrip:! -regex "%{_noautostrip}"}`; \
+	filelist=`find $RPM_BUILD_ROOT -type f ! -regex ".*ld-[0-9.]*so.*" ! -regex ".*/usr/lib[0-9]*/debug/.*\.debug" ! -regex ".*%{_docdir}/.*" %{?_noautostrip:! -regex "%{_noautostrip}"}`; \
 	if [ -z "$filelist" ]; then \
 		return; \
 	fi; \
@@ -387,7 +387,7 @@
 %__spec_install_post_chrpath {%{!?debug: \
 %{!?no_install_post_chrpath: __spec_install_post_chrpath() { \
 if [ -d "$RPM_BUILD_ROOT" ]; then \
-	files=`find $RPM_BUILD_ROOT -type f ! -regex ".*ld-[0-9.]*so.*" ! -regex ".*/usr/lib[0-9]*/debug/.*" %{?_noautochrpath:! -regex "%{_noautochrpath}"}`; \
+	files=`find $RPM_BUILD_ROOT -type f ! -regex ".*ld-[0-9.]*so.*" ! -regex ".*/usr/lib[0-9]*/debug/.*" ! -regex ".*%{_docdir}/.*" %{?_noautochrpath:! -regex "%{_noautochrpath}"}`; \
 	if [ -n "$files" ]; then \
 		objs=`echo "$files" | xargs -r -d'\\n' file | awk -F: '/ELF.*(executable.*dynamically linked|shared object)/ {print $1}'`; \
 	fi
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/rpm.macros?r1=1.358&r2=1.359&f=u