- merge from AC-branch: O for old rpmbuld(macros), noarch macros optimize

Changed files:
    rpm.spec -> 1.694

diff --git a/rpm.spec b/rpm.spec
index 1fbb741a03425ec9ab4acc3d1ac7268742dfa956..d903870c838944c930029e30724fdb7b29e85a45 100644 (file)
--- a/rpm.spec
+++ b/rpm.spec
@@ -428,6 +428,7 @@ Provides:   rpmbuild(noauto) = 3
 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.
@@ -859,6 +860,13 @@ for a in librpm-%{sover}.so librpmdb-%{sover}.so librpmio-%{sover}.so ; do
        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}