[packages/rpm-build-macros] - added rpm4 bcond (default on Ac)

qboosh qboosh at pld-linux.org
Sat Jun 15 16:22:30 CEST 2013


commit 428f252d4a71efb037e346a406fe4da64887c5a8
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Jun 15 16:22:37 2013 +0200

    - added rpm4 bcond (default on Ac)

 rpm-build-macros.spec | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)
---
diff --git a/rpm-build-macros.spec b/rpm-build-macros.spec
index 39d1349..2c34b91 100644
--- a/rpm-build-macros.spec
+++ b/rpm-build-macros.spec
@@ -1,3 +1,10 @@
+#
+# Conditional build:
+%bcond_with	rpm4	# prepare macros for PLD rpm 4.5 instead of rpm5
+#
+%if "%{pld_release}" == "ac"
+%define	with_rpm4	1
+%endif
 %define		rpm_macros_rev	1.664
 %define		find_lang_rev	1.36
 Summary:	PLD Linux RPM build macros
@@ -54,8 +61,8 @@ cp -p %{SOURCE1} .
 %if "%{pld_release}" == "ac"
 %{__sed} -i -e '/libtoolize --copy --force --install/s/ --install//' rpm.macros
 %patch0 -p1
-%patch1 -p1
 %endif
+%{?with_rpm4:%patch1 -p1}
 
 %build
 %{__sed} -i -e 's,{Revision},%{rpm_macros_rev},' rpm.macros
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/rpm-build-macros.git/commitdiff/428f252d4a71efb037e346a406fe4da64887c5a8



More information about the pld-cvs-commit mailing list