From: Jan Rękorajski <baggins@pld-linux.org>
Date: Wed, 24 Oct 2012 21:47:33 +0000 (+0200)
Subject: - check to see if rebuilding against db 5.2 fixes some bugs
X-Git-Tag: auto/th/rpm-5.4.10-35.1~16
X-Git-Url: http://git.pld-linux.org/?p=packages%2Frpm.git;a=commitdiff_plain;h=bf728d07ef57d4a32b98a02de34e377dfe0a93a0

- check to see if rebuilding against db 5.2 fixes some bugs
---

diff --git a/rpm-db5.2.patch b/rpm-db5.2.patch
new file mode 100644
index 0000000..7ed49e4
--- /dev/null
+++ b/rpm-db5.2.patch
@@ -0,0 +1,31 @@
+--- rpm-5.4.10/configure.ac~	2012-07-18 21:42:22.133130256 +0200
++++ rpm-5.4.10/configure.ac	2012-07-18 21:45:04.726457854 +0200
+@@ -543,7 +543,7 @@
+     MYPATH=$PATH
+ fi
+ 
+-DBXY=db53
++DBXY=db5.2
+ 
+ AC_PATH_PROG(__BASH, bash, %{_bindir}/bash, $MYPATH)
+ AC_PATH_PROG(__BZIP2, bzip2, %{_bindir}/bzip2, $MYPATH)
+--- rpm-5.4.10/configure.ac~	2012-10-24 23:26:28.650695811 +0200
++++ rpm-5.4.10/configure.ac	2012-10-24 23:35:55.777342472 +0200
+@@ -1582,7 +1582,7 @@
+ CPPFLAGS="${CPPFLAGS} -I${prefix}/include/${DBXY}"
+ RPM_CHECK_LIB(
+     [Berkeley-DB], [db],
+-    [db-5.3], [db_create], [db.h],
++    [db-5.2], [db_create], [db.h],
+     [yes,external], [db3],
+     [ DBLIBSRCS="$DBLIBSRCS db3.c"
+       AM_CONDITIONAL(WITH_DB, [ true ])
+@@ -1609,7 +1609,7 @@
+ dnl XXX error: `db3' is already registered with AC_CONFIG_SUBDIRS.
+ RPM_CHECK_LIB(
+     [Berkeley-DB (+SQLite3)], [dbsql],
+-    [db_sql-5.3], [sqlite3_open], [dbsql.h],
++    [db_sql-5.2], [sqlite3_open], [dbsql.h],
+     [yes,external], [db3/sql],
+     [
+       AM_CONDITIONAL(WITH_DBSQL, [ true ])
diff --git a/rpm.spec b/rpm.spec
index b4fb4a3..7b7f634 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -37,8 +37,8 @@ ERROR
 %endif
 
 # versions of required libraries
-%define		reqdb_pkg	db5.3
-%define		reqdb_ver	5.3
+%define		reqdb_pkg	db5.2
+%define		reqdb_ver	5.2
 %define		reqpopt_ver	1.15
 %define		beecrypt_ver	2:4.1.2-4
 %define		sover		5.4
@@ -52,7 +52,7 @@ Summary(ru.UTF-8):	Менеджер пакетов от RPM
 Summary(uk.UTF-8):	Менеджер пакетів від RPM
 Name:		rpm
 Version:	5.4.10
-Release:	26
+Release:	26.1
 License:	LGPL
 Group:		Base
 # http://rpm5.org/files/rpm/rpm-5.4/rpm-5.4.10-0.20120706.src.rpm
@@ -115,7 +115,7 @@ Patch22:	%{name}-sparc64.patch
 Patch23:	%{name}-gendiff.patch
 Patch24:	openmp.patch
 Patch25:	%{name}-URPM-build-fix.patch
-Patch26:	%{name}-db5.3.patch
+Patch26:	%{name}-db5.2.patch
 Patch27:	%{name}-helperEVR-noassert.patch
 Patch28:	%{name}-unglobal.patch
 Patch29:	%{name}-builddir-readlink.patch
@@ -823,7 +823,7 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze
 %patch38 -p1
 %patch39 -p1
 %patch40 -p1
-%patch41 -p1
+#patch41 -p1
 %patch42 -p1
 %patch43 -p1
 %patch44 -p1