From 5b58b7906985a426833292141303e439be880def Mon Sep 17 00:00:00 2001 From: Denis Silakov Date: Thu, 25 Apr 2013 15:19:52 +0400 Subject: [PATCH] Fix dbconvert.sh to use version 5.2 --- rpm-5.4.10-dbconvert-5.2.patch | 12 ++++++++++++ rpm.spec | 6 +++++- 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 rpm-5.4.10-dbconvert-5.2.patch diff --git a/rpm-5.4.10-dbconvert-5.2.patch b/rpm-5.4.10-dbconvert-5.2.patch new file mode 100644 index 0000000..4f1f132 --- /dev/null +++ b/rpm-5.4.10-dbconvert-5.2.patch @@ -0,0 +1,12 @@ +diff -Naur rpm-5.4.10.orig/scripts/dbconvert.sh rpm-5.4.10/scripts/dbconvert.sh +--- rpm-5.4.10.orig/scripts/dbconvert.sh 2013-04-25 15:06:25.934554231 +0400 ++++ rpm-5.4.10/scripts/dbconvert.sh 2013-04-25 15:06:31.721744337 +0400 +@@ -9,7 +9,7 @@ + DBVERBOSE=${DBVERBOSE:-1} + DBREBUILD=${DBREBUILD:-0} + +-DBVERSION=5.1 ++DBVERSION=5.2 + DBERROR=0 + for db_tool in db_stat db_dump db_load db_recover; do + db_tool_versioned=$(echo $db_tool | sed -e 's/^db_/db'"${DBVERSION}"'/' -e 's/^db\([0-9]*\)\.\([0-9]*\)/db\1\2_/') diff --git a/rpm.spec b/rpm.spec index 2ad7d6c..b86c7bc 100644 --- a/rpm.spec +++ b/rpm.spec @@ -59,7 +59,7 @@ Summary: The RPM package management system Name: rpm Epoch: 1 Version: %{libver}.%{minorver} -Release: %{?prereldate:0.%{prereldate}.}9 +Release: %{?prereldate:0.%{prereldate}.}10 License: LGPLv2.1+ Group: System/Configuration/Packaging URL: http://rpm5.org/ @@ -359,6 +359,8 @@ Patch162: rpm-5.4.10-fix-uninitialized-variable.patch # status: ready Patch169: rpm-5.4.10-update-and-use-brp-compress.patch +Patch170: rpm-5.4.10-dbconvert-5.2.patch + # ROSA stuff Patch501: rpm-5.3.12.vendor.ROSA.patch # Restore RPM_PACKAGE_NAME export as it's still used by aot-compile-rpm @@ -732,6 +734,8 @@ This package contains the RPM API documentation generated in HTML format. %patch169 -p1 -b .brpcomp~ +%patch170 -p1 -b .dbconvert52~ + %patch501 -p1 -b .rosa_vendor~ %patch502 -p1 -b .package_name~ %patch503 -p1 -b .specspo~