[packages/poldek] use rpm4/db4.7 instead of rpm5 bcond for th

glen glen at pld-linux.org
Wed Dec 31 13:34:16 CET 2014


commit 5fda028a1e0d9ff0cf341c896fb05ecf84843b94
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Mon Nov 4 16:25:28 2013 +0200

    use rpm4/db4.7 instead of rpm5 bcond for th

 poldek.spec | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)
---
diff --git a/poldek.spec b/poldek.spec
index f2edc06..7d9ea45 100644
--- a/poldek.spec
+++ b/poldek.spec
@@ -5,6 +5,7 @@
 %bcond_without	python	# don't build python bindings
 %bcond_with	snap	# install configs for official Th snapshot
 %bcond_with	db60	# DB 6.0 instead of 5.2
+%bcond_without	rpm4	# use rpm4/db4.7 instead of rpm5
 
 # current snapshot name
 %define		SNAP	2014
@@ -20,7 +21,14 @@
 %define		ver_db		5.2
 %define		ver_db_rel	3
 %endif
+
+%if %{with rpm4}
+%define		ver_db		4.7.25
+%define		ver_db_rel	1
+%define		ver_rpm		4.5-49
+%else
 %define		ver_rpm		5.4.10
+%endif
 
 %define		rel	2
 Summary:	RPM packages management helper tool
@@ -91,8 +99,7 @@ Requires:	%{db_pkg} >= %{ver_db}-%{ver_db_rel}
 Requires:	%{name}-libs = %{version}-%{release}
 Requires:	rpm >= %{ver_rpm}
 Requires:	rpm-db-ver = %{ver_db}
-#Requires:	rpm-lib = %(rpm -q --qf '%{V}' rpm-lib)
-Requires:	rpm-lib >= 5.4.10
+Requires:	rpm-lib >= %{ver_rpm}
 # vf* scripts use sed
 Requires:	sed
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/poldek.git/commitdiff/5fda028a1e0d9ff0cf341c896fb05ecf84843b94



More information about the pld-cvs-commit mailing list