From: Jan Rękorajski <baggins@pld-linux.org>
Date: Wed, 20 Feb 2013 11:33:57 +0000 (+0100)
Subject: - use the same version of bdb utils that rpm does
X-Git-Tag: auto/th/util-vserver-0.30.216-1.pre3034.8
X-Git-Url: http://git.pld-linux.org/?p=packages%2Futil-vserver.git;a=commitdiff_plain;h=35d779f232a26b2f03b4a9961bf21f1dd7b9baa6

- use the same version of bdb utils that rpm does
- rel 8
---

diff --git a/util-vserver-dbrebuild-internalize4.patch b/util-vserver-dbrebuild-internalize4.patch
index b97d6d4..204dfff 100644
--- a/util-vserver-dbrebuild-internalize4.patch
+++ b/util-vserver-dbrebuild-internalize4.patch
@@ -49,7 +49,7 @@
  	    panic "
  Can not continue; use '--force' to override this check"
 +
-+	verifyDBTools "$vdir" 'internal' db_dump db_load || test -n "$IS_FORCE" ||
++	verifyDBTools "$vdir" 'internal' db@RPMDB@_dump db@RPMDB@_load || test -n "$IS_FORCE" ||
 +	    panic "
 +Can not continue; use '--force' to override this check"
      
@@ -61,7 +61,7 @@
  	findDir RPMETCDIR   "$cfgdir"/rpmetc   "$cfgdir"/base/rpm/etc    /etc/rpm /
  	findDir RPMSTATEDIR "$cfgdir"/rpmstate "$cfgdir"/base/rpm/state
      else
-+	verifyDBTools "$vdir" 'external' db_load db_dump || test -n "$IS_FORCE" ||
++	verifyDBTools "$vdir" 'external' db@RPMDB@_load db@RPMDB@_dump || test -n "$IS_FORCE" ||
 +	    panic "
 +Can not continue; use '--force' to override this check"
 +
@@ -78,10 +78,10 @@
 +
 +	    # dump and reload rpmdb to overcome db version mismatch problems
 +	    if [ "$db_load" -a "$db_dump" ]; then
-+		# dump with host db_dump
++		# dump with host db@RPMDB@_dump
 +		$db_dump var/lib/rpm/Packages > var/lib/rpm/.Packages.dump
 +
-+		# load with guest db_load.
++		# load with guest db@RPMDB@_load.
 +		$_RM -f var/lib/rpm/__db.*
 +		mv var/lib/rpm/{Packages,.Packages.ORIG}
 +		chroot . $db_load var/lib/rpm/Packages < var/lib/rpm/.Packages.dump
@@ -96,11 +96,11 @@
 +	    if [ "$db_load" -a "$db_dump" ]; then
 +		# dump and reload rpmdb to overcome db version mismatch problems
 +
-+		# dump with guest db_dump
++		# dump with guest db@RPMDB@_dump
 +		$_RM -f var/lib/rpm/__db.*
 +		chroot . $db_dump var/lib/rpm/Packages > var/lib/rpm/.Packages.dump
 +
-+		# load with host db_load
++		# load with host db@RPMDB@_load
 +		mv var/lib/rpm/{Packages,.Packages.ORIG}
 +		$db_load var/lib/rpm/Packages < var/lib/rpm/.Packages.dump
 +		rm -f var/lib/rpm/.Packages.*
diff --git a/util-vserver.spec b/util-vserver.spec
index ee3266c..5f6fc8c 100644
--- a/util-vserver.spec
+++ b/util-vserver.spec
@@ -15,10 +15,11 @@
 %undefine	with_doc
 %endif
 
-# reqdb_pkg should match value from current rpm package in distro
+# reqdb_pkg and reqdb_ver must match value from current rpm package in distro
 %define		reqdb_pkg	db5.2
+%define		reqdb_ver	5.2
 %define		snap	pre3034
-%define		rel	7
+%define		rel	8
 Summary:	Linux virtual server utilities
 Summary(pl.UTF-8):	Narzędzia dla linuksowych serwerów wirtualnych
 Name:		util-vserver
@@ -447,6 +448,8 @@ Szablony do tworzenia VServerów dla dystrybucji Titanium Linux.
 
 cp -p %{SOURCE9} package-management.txt
 
+%{__sed} -i -e "s/@RPMDB@/%{reqdb_ver}/g" scripts/pkgmgmt
+
 %build
 unset LD_SYMBOLIC_FUNCTIONS || :