From: Jan Palus <atler@pld-linux.org>
Date: Fri, 30 Oct 2020 20:58:08 +0000 (+0100)
Subject: add bcond for building with cheating (disabled by default)
X-Git-Tag: auto/th/rpm-4.16.1.2-1~32
X-Git-Url: http://git.pld-linux.org/?p=packages%2Frpm.git;a=commitdiff_plain;h=de65aff60039f593b7c63381fd3349af1e45b7e3

add bcond for building with cheating (disabled by default)

don't produce broken packages in short-circuted builds
---

diff --git a/rpm-enable_cheating.patch b/rpm-enable_cheating.patch
new file mode 100644
index 0000000..bd032ed
--- /dev/null
+++ b/rpm-enable_cheating.patch
@@ -0,0 +1,14 @@
+diff --color -urN rpm-4.16.0.orig/build/pack.c rpm-4.16.0/build/pack.c
+--- rpm-4.16.0.orig/build/pack.c	2020-06-23 14:13:01.894628368 +0200
++++ rpm-4.16.0/build/pack.c	2020-10-30 21:38:40.630227852 +0100
+@@ -709,10 +709,6 @@
+ 	headerPutBin(pkg->header, RPMTAG_SOURCEPKGID, spec->sourcePkgId,16);
+     }
+ 
+-    if (cheating) {
+-	(void) rpmlibNeedsFeature(pkg, "ShortCircuited", "4.9.0-1");
+-    }
+-
+     if ((rc = getPkgFilename(pkg->header, filename)))
+ 	return rc;
+ 
diff --git a/rpm.spec b/rpm.spec
index 16f66cd..808ffeb 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -8,6 +8,7 @@
 %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
@@ -74,6 +75,7 @@ Patch19:	pkgconfig.patch
 Patch20:	uname-deps.patch
 Patch21:	aarch64.patch
 Patch22:	ix86-platforms.patch
+Patch23:	%{name}-enable_cheating.patch
 URL:		https://rpm.org/
 BuildRequires:	acl-devel
 BuildRequires:	db-devel >= %{db_ver}
@@ -562,6 +564,9 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze
 %patch20 -p1
 %patch21 -p1
 %patch22 -p1
+%if %{with cheating}
+%patch23 -p1
+%endif
 
 install %{SOURCE15} scripts/perl.prov.in