From 3b68526e40d8ccd466c60def0ddf3460fc01dd80 Mon Sep 17 00:00:00 2001 From: xujing Date: Mon, 6 Feb 2023 11:01:52 +0800 Subject: [PATCH] don't automatically execute rmbuild --- don-t-automatically-execute-rmbuild.patch | 45 +++++++++++++++++++++++ rpm.spec | 6 ++- 2 files changed, 50 insertions(+), 1 deletion(-) create mode 100644 don-t-automatically-execute-rmbuild.patch diff --git a/don-t-automatically-execute-rmbuild.patch b/don-t-automatically-execute-rmbuild.patch new file mode 100644 index 0000000..a58c45f --- /dev/null +++ b/don-t-automatically-execute-rmbuild.patch @@ -0,0 +1,45 @@ +From cdc8f14e31fd6bd14b6d4bba40bbb3be257c8d10 Mon Sep 17 00:00:00 2001 +From: xuraoqing <609179072@qq.com> +Date: Mon, 6 Feb 2023 10:58:29 +0800 +Subject: [PATCH] don't automatically execute rmbuild + +--- + rpmbuild.c | 1 - + tests/rpmbuild.at | 2 -- + 2 files changed, 3 deletions(-) + +diff --git a/rpmbuild.c b/rpmbuild.c +index cb02b31..2c581f7 100644 +--- a/rpmbuild.c ++++ b/rpmbuild.c +@@ -649,7 +649,6 @@ int main(int argc, char *argv[]) + ba->buildAmount |= RPMBUILD_CLEAN; + if ((buildChar == 'b') && shortCircuit) + break; +- ba->buildAmount |= RPMBUILD_RMBUILD; + /* fallthrough */ + case 'i': + ba->buildAmount |= RPMBUILD_INSTALL; +diff --git a/tests/rpmbuild.at b/tests/rpmbuild.at +index bb3bdc1..09e8c1a 100644 +--- a/tests/rpmbuild.at ++++ b/tests/rpmbuild.at +@@ -117,7 +117,6 @@ Executing(%build) + Executing(%install) + Executing(%check) + Executing(%clean) +-Executing(rmbuild) + ], + []) + +@@ -132,7 +131,6 @@ Executing(%build) + Executing(%install) + Executing(%check) + Executing(%clean) +-Executing(rmbuild) + ], + []) + +-- +2.27.0 + diff --git a/rpm.spec b/rpm.spec index 56a0812..8e32273 100644 --- a/rpm.spec +++ b/rpm.spec @@ -1,6 +1,6 @@ Name: rpm Version: 4.18.0 -Release: 1 +Release: 2 Summary: RPM Package Manager License: GPLv2+ URL: http://www.rpm.org/ @@ -34,6 +34,7 @@ Patch6012: backport-Fix-fileleak-and-memleak-in-rpmInstall.patch Patch6013: backport-Fix-fileleak-when-urlGetFile-fails-in-rpmInstall.patch Patch9000: rpm-fix-rpm-is-blocked-when-open-fifo-file.patch +Patch9001: don-t-automatically-execute-rmbuild.patch BuildRequires: gcc autoconf automake libtool make gawk popt-devel openssl-devel readline-devel BuildRequires: zlib-devel zstd-devel >= 1.3.8 xz-devel bzip2-devel libarchive-devel ima-evm-utils-devel @@ -316,6 +317,9 @@ make check || (cat tests/rpmtests.log; exit 0) %exclude %{_mandir}/man8/rpmspec.8.gz %changelog +* Mon Feb 06 2023 xujing - 4.18.0-2 +- don't automatically execute rmbuild + * Thu Feb 02 2023 xujing - 4.18.0-1 - update version to 4.18.0