- remove erroneous ifnarch test from macros, that was effectively always

  true, thus breaking stripping
- rel 11

diff --git a/macros.pld.in b/macros.pld.in
index fc6d889d4885320406217ff3c74d464c9d0b061a..60c73f1541b88104c83633825d3551e6869ad914 100644 (file)
--- a/macros.pld.in
+++ b/macros.pld.in
@@ -46,12 +46,10 @@
 %__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}\
 %{__spec_install_post_check_so}\
-%endif}\
 %{__spec_install_post_check_tmpfiles}\
 %{__spec_install_post_compress_docs}\
 %{__spec_install_post_py_hardlink}\

diff --git a/rpm.spec b/rpm.spec
index 146fb5cbcdc9172d54c06daeaa07f77a52d7f64d..054d9e0cb4375a5c2216a7338d61c34d3697c89f 100644 (file)
--- a/rpm.spec
+++ b/rpm.spec
@@ -51,7 +51,7 @@ Summary(ru.UTF-8):    Менеджер пакетов от RPM
 Summary(uk.UTF-8):     Менеджер пакетів від RPM
 Name:          rpm
 Version:       5.4.10
-Release:       10
+Release:       11
 License:       LGPL
 Group:         Base
 # http://rpm5.org/files/rpm/rpm-5.4/rpm-5.4.10-0.20120706.src.rpm
@@ -775,7 +775,7 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze
 %patch12 -p1
 %patch13 -p1
 %patch14 -p0
-#patch15 -p1
+%patch15 -p1
 %patch16 -p1
 %patch17 -p1
 %patch18 -p1