- moved __os_install_post to platform dependend macros (to overide default macros)

Changed files:
    rpm.macros -> 1.114
    rpm.platform -> 1.2

diff --git a/rpm.macros b/rpm.macros
index e37b22be6d855935431809600a73d2d7affeadf5..e4803db01168b08a2baa022f74e39dbe14bc17e1 100644 (file)
--- a/rpm.macros
+++ b/rpm.macros
@@ -271,17 +271,6 @@ fi \
 %{?_noautocompressdoc:echo '%{_noautocompressdoc}' > %{_builddir}/__rpm_noautocompressdoc}\
 %{nil}
 
-%__os_install_post \
-%{?_noautoreqfiles:for f in %{_noautoreqfiles} ; do echo %{?buildroot:%{buildroot}}$f >> %{_builddir}/__rpm_noautoreqfiles ; done }\
-%{?_noautoreq:for f in %{_noautoreq} ; do echo "$f" >> %{_builddir}/__rpm_noautoreq ; done }\
-%{?_noautoreqdep:for f in %{_noautoreqdep} ; do echo "$f" >> %{_builddir}/__rpm_noautoreqdep ; done }\
-%{?_noautoprovfiles:for f in %{_noautoprovfiles} ; do echo %{?buildroot:%{buildroot}}$f >> %{_builddir}/__rpm_noautoprovfiles ; done }\
-%{?_noautoprov:for f in %{_noautoprov} ; do echo "$f" >> %{_builddir}/__rpm_noautoprov ; done }\
-%{__spec_install_post_strip}\
-%{__spec_install_post_compress_docs}\
-%{__spec_install_post_compress_modules}\
-%{__arch_install_post}\
-%{nil}
 
 %__spec_clean_pre      %{___build_pre}\
 _autoreqprov=n \

diff --git a/rpm.platform b/rpm.platform
index 6203d1430b0f665d307e22298601d8b04ab61cc0..1885d0c9c5fad96bb16686455b3dfe2396b92534 100644 (file)
--- a/rpm.platform
+++ b/rpm.platform
@@ -14,3 +14,16 @@
 %_infodir        /usr/share/info
 %_mandir         %{_prefix}/share/man
 %_defaultdocdir  /usr/share/doc
+
+%__os_install_post \
+%{?_noautoreqfiles:for f in %{_noautoreqfiles} ; do echo %{?buildroot:%{buildroot}}$f >> %{_builddir}/__rpm_noautoreqfiles ; done }\
+%{?_noautoreq:for f in %{_noautoreq} ; do echo "$f" >> %{_builddir}/__rpm_noautoreq ; done }\
+%{?_noautoreqdep:for f in %{_noautoreqdep} ; do echo "$f" >> %{_builddir}/__rpm_noautoreqdep ; done }\
+%{?_noautoprovfiles:for f in %{_noautoprovfiles} ; do echo %{?buildroot:%{buildroot}}$f >> %{_builddir}/__rpm_noautoprovfiles ; done }\
+%{?_noautoprov:for f in %{_noautoprov} ; do echo "$f" >> %{_builddir}/__rpm_noautoprov ; done }\
+%{__spec_install_post_strip}\
+%{__spec_install_post_compress_docs}\
+%{__spec_install_post_compress_modules}\
+%{__arch_install_post}\
+%{nil}
+