X-Git-Url: http://git.pld-linux.org/?p=packages%2Frpm.git;a=blobdiff_plain;f=rpm.spec;h=c7bef13af7a728bb7b48c7aac45f3f5f74596700;hp=808ffeba44cd9115eb0cce0f59b237a1f2147e87;hb=2aa7d974ad81aa11e64f99d8a0b8af5d8176b044;hpb=de65aff60039f593b7c63381fd3349af1e45b7e3

diff --git a/rpm.spec b/rpm.spec
index 808ffeb..c7bef13 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -8,7 +8,6 @@
 %bcond_without	plugins		# build plugins
 %bcond_without	recommends_tags	# build without Recommends tag (bootstrapping)
 %bcond_with	imaevm		# build with IMA/EVM support (requires libimaevm from ima-evm-utils)
-%bcond_with	cheating	# do not add spurious deps to short-circuited builds
 
 %define		db_ver		5.3.28.0
 %define		popt_ver	1.15
@@ -27,7 +26,7 @@ Summary(ru.UTF-8):	Менеджер пакетов от RPM
 Summary(uk.UTF-8):	Менеджер пакетів від RPM
 Name:		rpm
 Version:	4.16.0
-Release:	0.4
+Release:	0.7
 Epoch:		1
 License:	GPL v2 / LGPL v2.1
 Group:		Base
@@ -75,7 +74,9 @@ Patch19:	pkgconfig.patch
 Patch20:	uname-deps.patch
 Patch21:	aarch64.patch
 Patch22:	ix86-platforms.patch
-Patch23:	%{name}-enable_cheating.patch
+Patch23:	shortcircuited-deps.patch
+Patch24:	cpuinfo-deps.patch
+Patch25:	rpmio-read-proc-files.patch
 URL:		https://rpm.org/
 BuildRequires:	acl-devel
 BuildRequires:	db-devel >= %{db_ver}
@@ -564,9 +565,9 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze
 %patch20 -p1
 %patch21 -p1
 %patch22 -p1
-%if %{with cheating}
 %patch23 -p1
-%endif
+%patch24 -p1
+%patch25 -p1
 
 install %{SOURCE15} scripts/perl.prov.in
 
@@ -605,6 +606,7 @@ sed -i \
 	--disable-silent-rules \
 	--enable-shared \
 	--enable-bdb \
+	--enable-bdb-ro \
 	--enable-ndb \
 	--enable-sqlite \
 	--enable-zstd \