X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=rpm.spec;h=4c615832f2297024f1bd5a9b2ece68768db9ae31;hb=27c7217eea874a4f898798dc181e80a05b82f0f7;hp=62c3a3a4da8c1a6d817e042d4f5812a13ab1af70;hpb=bc5500e1251ead923f42edad6dd9076345708c38;p=packages%2Frpm.git

diff --git a/rpm.spec b/rpm.spec
index 62c3a3a..4c61583 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -52,7 +52,7 @@ Summary(ru.UTF-8):	Менеджер пакетов от RPM
 Summary(uk.UTF-8):	Менеджер пакетів від RPM
 Name:		rpm
 Version:	5.4.10
-Release:	20
+Release:	31
 License:	LGPL
 Group:		Base
 # http://rpm5.org/files/rpm/rpm-5.4/rpm-5.4.10-0.20120706.src.rpm
@@ -136,13 +136,15 @@ Patch43:	%{name}-fix-___build_pre-macro.patch
 Patch44:	%{name}-missing-patch-file-fails-build.patch
 Patch45:	%{name}-remove-misleading-missing-patch-message.patch
 Patch46:	%{name}-file-magic-can-be-mixed-case.patch
-Patch47:	%{name}-query-file-always-noisy.patch
+Patch47:	%{name}-query-always-noisy.patch
 Patch48:	%{name}-verify-ghosts-broken-logic.patch
 Patch49:	%{name}-python-enable-compat-RPMSENSE.patch
 Patch50:	%{name}-dont-treat-gstreamer-modules-as-font.patch
 Patch51:	%{name}-gst-inspect-typo.patch
 Patch52:	%{name}-null-term-ascii-digest.patch
 Patch53:	%{name}-lua-enable-extra-libs.patch
+Patch54:	%{name}-fix-filedigests-verify.patch
+Patch55:	%{name}-disable-hmac-verify.patch
 
 # Patches imported from Mandriva
 
@@ -248,13 +250,22 @@ Patch1038:	rpm-5.4.10-support-ignore-arch-and-os-again.patch
 Patch1039:	rpm-5.4.4-fix-same-package-with-epoch-possible-to-upgrade.patch
 # we want that patch too, a bit of builder infrastructure relies on NOSIGNATURES
 Patch1040:	rpm-5.4.9-support-signatures-and-digest-disablers.patch
+# lack insight on actual functionality, which anyways seems broken, so let's
+# disable it to avoid errors from berkeley db..
+# status: keep locally
+Patch1041:	rpm-5.4.9-disable-l10ndir.patch
+# status: ready for merge
+Patch1042:	rpm-5.4.9-fix-rpm_qa-pattern.patch
+# status: i18n strings is getting dropped, so this one might be of less relevance,
+# but feel free to discuss it on rpm-devel
+Patch1043:	rpm-5.4.9-fix-mdvbz62979.patch
 
 URL:		http://rpm5.org/
 BuildRequires:	autoconf >= 2.60
 BuildRequires:	automake >= 1.4
 BuildRequires:	beecrypt-devel >= %{beecrypt_ver}
 BuildRequires:	bzip2-devel >= 1.0.2-17
-%{?with_db:BuildRequires:	db-devel >= %{reqdb_ver}}
+%{?with_db:BuildRequires:	%{reqdb_pkg}-devel >= %{reqdb_ver}}
 BuildRequires:	elfutils-devel >= 0.108
 #BuildRequires:	gettext-autopoint >= 0.11.4-2
 BuildRequires:	gettext-devel >= 0.11.4-2
@@ -830,6 +841,8 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze
 %patch51 -p1
 %patch52 -p0
 %patch53 -p1
+%patch54 -p1
+%patch55 -p1
 
 %patch1000 -p1
 %patch1001 -p1
@@ -872,6 +885,9 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze
 %patch1038 -p1
 %patch1039 -p1
 %patch1040 -p1
+%patch1041 -p1
+%patch1042 -p1
+#patch1043 -p1
 
 install %{SOURCE2} macros/pld.in
 install %{SOURCE8} scripts/php.prov.in
@@ -937,10 +953,6 @@ sed -i \
 	--with-bugreport="http://bugs.pld-linux.org/" \
 	--with-vendor=pld
 
-%if %{with neon}
-%{__mv} tests/probes-test-1-0.src.rpm{,-no-neon}
-%endif
-
 %{__make} -j1 \
 	CC="%{__cc}" \
 	CXX="%{__cxx}" \
@@ -948,7 +960,7 @@ sed -i \
 
 %{?with_apidocs:%{__make} apidocs}
 
-%{__cc} %{rpmcflags} tools/rpmdb_checkversion.c -o tools/rpmdb_checkversion -ldb
+%{__cc} %{rpmcflags} tools/rpmdb_checkversion.c -o tools/rpmdb_checkversion -ldb-%{reqdb_ver}
 
 %install
 rm -rf $RPM_BUILD_ROOT