[packages/util-vserver/db52] - use dbconvert.sh script to up/downgrade rpm database, will require rpm with it

[baggins]

commit dbed46fa643a13e747063a0457b36f7d5549fa0c
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Wed Nov 28 12:27:29 2012 +0100

    - use dbconvert.sh script to up/downgrade rpm database, will require rpm with it

 util-vserver-rpm5.patch | 4 ++--
 util-vserver.spec       | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/util-vserver.spec b/util-vserver.spec
index 9dd516e..4b5df1b 100644
--- a/util-vserver.spec
+++ b/util-vserver.spec
@@ -18,7 +18,7 @@
 # reqdb_pkg should match value from current rpm package in distro
 %define		reqdb_pkg	db5.3
 %define		snap	pre3034
-%define		rel	5
+%define		rel	5.1
 Summary:	Linux virtual server utilities
 Summary(pl.UTF-8):	Narzędzia dla linuksowych serwerów wirtualnych
 Name:		util-vserver
@@ -122,6 +122,7 @@ Requires:	issue
 Requires:	make
 Requires:	mktemp >= 1.5-18
 Requires:	rc-scripts >= 0.4.3.4
+#Requires:	rpm >= 3.4.10-36
 Requires:	tar
 Requires:	uname(release) >= 2.6.27
 Requires:	util-linux >= 2.13
diff --git a/util-vserver-rpm5.patch b/util-vserver-rpm5.patch
index dbd88ac..7f0cf06 100644
--- a/util-vserver-rpm5.patch
+++ b/util-vserver-rpm5.patch
@@ -22,7 +22,7 @@
 +    fi
 +    if [[ "$@" = *--convertdb* ]]; then
 +	VSOMETHING_WORKER=$__PKGLIBDIR/vrpm-convertdb-worker
-+	exec $_VSOMETHING "${send_through[@]}" /usr/lib/rpm/bin/dbconvert "${vsomething_opts[@]}" "${rpm_opts[@]}" --rebuilddb
++	exec $_VSOMETHING "${send_through[@]}" /usr/lib/rpm/bin/dbupgrade.sh "${vsomething_opts[@]}" "${rpm_opts[@]}"
 +    fi
 +fi
  exec $_VSOMETHING "${send_through[@]}" rpm "${vsomething_opts[@]}" "$@"
@@ -46,7 +46,7 @@
 +
 +pkgInit "$vserver" rpm
 +
-+exec /usr/lib/rpm/bin/dbconvert --root="$VDIR" "$@"
++exec /usr/lib/rpm/bin/dbupgrade.sh -r "$VDIR" "$@"
 --- util-vserver-0.30.216-pre3034/scripts/Makefile-files.orig	2012-04-24 11:48:10.000000000 +0200
 +++ util-vserver-0.30.216-pre3034/scripts/Makefile-files	2012-10-12 18:44:57.137928223 +0200
 @@ -10,6 +10,7 @@
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/util-vserver.git/commitdiff/dbed46fa643a13e747063a0457b36f7d5549fa0c