Skip arch dependent scripts via ifnarch condition on noarch

diff --git a/macros.pld.in b/macros.pld.in
index 2906629f4c9b679d2c84625b833b00d8e295dec3..ecdcb62fa5a9a7ec77e12f08c5cecd9495b94e8d 100644 (file)
--- a/macros.pld.in
+++ b/macros.pld.in
@@ -46,12 +46,14 @@
 %__compress_doc                @prefix@/lib/rpm/compress-doc%{?_noautocompressdoc: --noautocompressdoc='%{_noautocompressdoc}'}
 
 %__os_install_post \
+%ifnarch noarch\
 %{__spec_install_post_strip}\
 %{__spec_install_post_chrpath}\
+%{__spec_install_post_compress_modules}\
+%endif\
 %{__spec_install_post_check_so}\
 %{__spec_install_post_check_tmpfiles}\
 %{__spec_install_post_compress_docs}\
-%{__spec_install_post_compress_modules}\
 %{__spec_install_post_py_hardlink}\
 %{__spec_install_post_perl_clean}\
 %{__arch_install_post}\

diff --git a/rpm.spec b/rpm.spec
index eab55b1ec24aab61cf54f45129d67dffd65229ff..fe4be2f59c9acf8dfd8c013480c3cae7b15a7de6 100644 (file)
--- a/rpm.spec
+++ b/rpm.spec
@@ -971,13 +971,6 @@ for a in librpm-%{sover}.so librpmdb-%{sover}.so librpmio-%{sover}.so librpmbuil
        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
-
 # Bourne shell script vs ELF executable linked with rpm,rpmdb,rpmio
 mv $RPM_BUILD_ROOT{%{_rpmlibdir},%{_bindir}}/rpm2cpio