SPECS (rpm-4_4_9): rpm.spec, poldek.spec - add rpm-db-ver symbol matching s...

[patrys]

Author: patrys                       Date: Sun Jun  1 20:04:31 2008 GMT
Module: SPECS                         Tag: rpm-4_4_9
---- Log message:
- add rpm-db-ver symbol matching so both poldek and rpm use the same version of db

---- Files affected:
SPECS:
   rpm.spec (1.837.2.73 -> 1.837.2.74) , poldek.spec (1.340 -> 1.341) 

---- Diffs:

================================================================
Index: SPECS/rpm.spec
diff -u SPECS/rpm.spec:1.837.2.73 SPECS/rpm.spec:1.837.2.74
--- SPECS/rpm.spec:1.837.2.73	Fri May 30 11:26:48 2008
+++ SPECS/rpm.spec	Sun Jun  1 22:04:25 2008
@@ -186,6 +186,7 @@
 Requires:	%{name}-lib = %{version}-%{release}
 Requires:	beecrypt >= %{beecrypt_ver}
 Requires:	popt >= %{reqpopt_ver}
+Provides:	rpm-db-ver = %{reqdb_ver}
 Obsoletes:	rpm-getdeps
 %{!?with_static:Obsoletes:	rpm-utils-static}
 Conflicts:	glibc < 2.2.92
@@ -1344,6 +1345,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.837.2.74  2008-06-01 20:04:25  patrys
+- add rpm-db-ver symbol matching so both poldek and rpm use the same version of db
+
 Revision 1.837.2.73  2008-05-30 09:26:48  jajcus
 - match upper case 'Linux' in platform file too (some foreign packages use that)
 

================================================================
Index: SPECS/poldek.spec
diff -u SPECS/poldek.spec:1.340 SPECS/poldek.spec:1.341
--- SPECS/poldek.spec:1.340	Fri May 30 19:14:47 2008
+++ SPECS/poldek.spec	Sun Jun  1 22:04:26 2008
@@ -7,9 +7,11 @@
 #
 # required versions (forced to avoid SEGV with mixed db used by rpm and poldek)
 %if "%{pld_release}" == "ti"
-%define	ver_db	4.5.20-8
+%define	ver_db	4.5.20
+%define ver_db_rel 8
 %else
-%define	ver_db	4.7.25-1
+%define	ver_db	4.7.25
+%define ver_db_rel 1
 %endif
 %define	ver_rpm	4.4.9-56
 #
@@ -40,7 +42,7 @@
 BuildRequires:	automake
 BuildRequires:	bzip2-devel
 BuildRequires:	check
-BuildRequires:	db-devel >= %{ver_db}
+BuildRequires:	db-devel >= %{ver_db}-%{ver_db_rel}
 BuildRequires:	gettext-autopoint
 BuildRequires:	libtool
 BuildRequires:	libxml2-devel
@@ -57,7 +59,7 @@
 BuildRequires:	zlib-devel
 %if %{with static}
 BuildRequires:	bzip2-static
-BuildRequires:	db-static >= %{ver_db}
+BuildRequires:	db-static >= %{ver_db}-%{ver_db_rel}
 BuildRequires:	glibc-static
 BuildRequires:	libselinux-static
 BuildRequires:	libxml2-static
@@ -72,8 +74,9 @@
 Requires(triggerpostun):	awk
 Requires(triggerpostun):	sed >= 4.0
 Requires:	%{name}-libs = %{version}-%{release}
-Requires:	db >= %{ver_db}
+Requires:	db >= %{ver_db}-%{ver_db_rel}
 Requires:	rpm >= %{ver_rpm}
+Requires:	rpm-db-ver = %{ver_db}
 Requires:	rpm-lib = %(rpm -q --qf '%{V}' rpm-lib)
 # vf* scripts use sed
 Requires:	sed
@@ -401,6 +404,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.341  2008-06-01 20:04:26  patrys
+- add rpm-db-ver symbol matching so both poldek and rpm use the same version of db
+
 Revision 1.340  2008-05-30 17:14:47  hawk
 - Titanium requires db4.5
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/rpm.spec?r1=1.837.2.73&r2=1.837.2.74&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/poldek.spec?r1=1.340&r2=1.341&f=u