[packages/rpm] - remove erroneous ifnarch test from macros, that was effectively always true, thus breaking strip
baggins
baggins at pld-linux.org
Mon Sep 24 23:45:14 CEST 2012
commit 7033e97626d2062ccf054ef7419b18171ae739a5
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Mon Sep 24 23:44:09 2012 +0200
- remove erroneous ifnarch test from macros, that was effectively always
true, thus breaking stripping
- rel 11
macros.pld.in | 2 --
rpm.spec | 4 ++--
2 files changed, 2 insertions(+), 4 deletions(-)
---
diff --git a/rpm.spec b/rpm.spec
index 146fb5c..054d9e0 100644
--- 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
diff --git a/macros.pld.in b/macros.pld.in
index fc6d889..60c73f1 100644
--- 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}\
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/rpm.git/commitdiff/7033e97626d2062ccf054ef7419b18171ae739a5
More information about the pld-cvs-commit
mailing list