SPECS (AC-branch): rpm.spec - remove arch dependant %install macro...

glen glen at pld-linux.org
Sat Aug 20 21:04:01 CEST 2005


Author: glen                         Date: Sat Aug 20 19:04:01 2005 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- remove arch dependant %install macros from noarch macros file

---- Files affected:
SPECS:
   rpm.spec (1.555.2.96 -> 1.555.2.97) 

---- Diffs:

================================================================
Index: SPECS/rpm.spec
diff -u SPECS/rpm.spec:1.555.2.96 SPECS/rpm.spec:1.555.2.97
--- SPECS/rpm.spec:1.555.2.96	Mon Aug 15 22:07:51 2005
+++ SPECS/rpm.spec	Sat Aug 20 21:03:55 2005
@@ -861,6 +861,13 @@
 	ln -s /%{_lib}/$a $RPM_BUILD_ROOT%{_libdir}/$a
 done
 
+# remove arch dependant macros which have no use on noarch
+sed -i -e '
+/{__spec_install_post_strip}/d
+/{__spec_install_post_chrpath}/d
+/{__spec_install_post_compress_modules}/d
+' $RPM_BUILD_ROOT%{_rpmlibdir}/noarch-linux/macros
+
 %py_ocomp $RPM_BUILD_ROOT%{py_sitedir}
 %py_comp $RPM_BUILD_ROOT%{py_sitedir}
 
@@ -1106,6 +1113,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.555.2.97  2005/08/20 19:03:55  glen
+- remove arch dependant %install macros from noarch macros file
+
 Revision 1.555.2.96  2005/08/15 20:07:51  glen
 - appears to work. rel 1
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/rpm.spec?r1=1.555.2.96&r2=1.555.2.97&f=u




More information about the pld-cvs-commit mailing list