SPECS: rpm.spec - merge from AC-branch: O for old rpmbuld(macros), ...

[glen]

Author: glen                         Date: Thu Sep 15 19:06:55 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- merge from AC-branch: O for old rpmbuld(macros), noarch macros optimize

---- Files affected:
SPECS:
   rpm.spec (1.693 -> 1.694) 

---- Diffs:

================================================================
Index: SPECS/rpm.spec
diff -u SPECS/rpm.spec:1.693 SPECS/rpm.spec:1.694
--- SPECS/rpm.spec:1.693	Wed Sep 14 16:14:17 2005
+++ SPECS/rpm.spec	Thu Sep 15 21:06:49 2005
@@ -429,6 +429,7 @@
 Conflicts:	automake < 1:1.7.9-2
 Conflicts:	libtool < 2:1.5-13
 %endif
+Obsoletes:	rpmbuild(macros) < %{rpm_macros_rev}
 
 %description build
 Scripts for building binary RPM packages.
@@ -860,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}
 
@@ -1104,6 +1112,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.694  2005/09/15 19:06:49  glen
+- merge from AC-branch: O for old rpmbuld(macros), noarch macros optimize
+
 Revision 1.693  2005/09/14 14:14:17  glen
 - rpm_macros_rev 1.238, rel 4
 
================================================================

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