[packages/rpm] Skip arch dependent scripts via ifnarch condition on noarch

[baggins]

commit 41da1a4648de86260173b29db30afa0f94162b6e
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Mon Sep 3 10:28:19 2012 +0200

    Skip arch dependent scripts via ifnarch condition on noarch

 macros.pld.in | 4 +++-
 rpm.spec      | 7 -------
 2 files changed, 3 insertions(+), 8 deletions(-)
---
diff --git a/rpm.spec b/rpm.spec
index eab55b1..fe4be2f 100644
--- 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
 
diff --git a/macros.pld.in b/macros.pld.in
index 2906629..ecdcb62 100644
--- 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}\
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/rpm.git/commitdiff/41da1a4648de86260173b29db30afa0f94162b6e