Merge branch 'master' into db52

Conflicts:
	rpm-db5.2.patch
	rpm.spec

diff --git a/rpm-db5.2.patch b/rpm-db5.2.patch
index cdbd78203d452584a394931c315b9c16897c2006..7ed49e446d2dbe1a0e712f419bbaba6a3547e22e 100644 (file)
--- a/rpm-db5.2.patch
+++ b/rpm-db5.2.patch
@@ -9,6 +9,8 @@
  
  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(

diff --git a/rpm.spec b/rpm.spec
index 3d7f11895f4dfcaae42dc15fa784a1d09041e6f2..6fd5363990152d8644476954bc5007fd6ecd5d9e 100644 (file)
--- 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
@@ -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
@@ -827,7 +827,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