From c9d5dc3b3a1a492a62d6eaf5ec1ba5b33d2752e5 Mon Sep 17 00:00:00 2001
From: xujing <xujing125@huawei.com>
Date: Mon, 6 Feb 2023 19:10:04 +0800
Subject: [PATCH] make clean after check to adapt rpm upstream logic

---
 don-t-automatically-execute-rmbuild.patch | 45 -----------------------
 rpm.spec                                  | 10 ++++-
 2 files changed, 8 insertions(+), 47 deletions(-)
 delete mode 100644 don-t-automatically-execute-rmbuild.patch

diff --git a/don-t-automatically-execute-rmbuild.patch b/don-t-automatically-execute-rmbuild.patch
deleted file mode 100644
index a58c45f..0000000
--- a/don-t-automatically-execute-rmbuild.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-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 8e32273..88a81bd 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -1,6 +1,6 @@
 Name:          rpm
 Version:       4.18.0
-Release:       2
+Release:       3
 Summary:       RPM Package Manager
 License:       GPLv2+
 URL:           http://www.rpm.org/
@@ -34,7 +34,6 @@ 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
@@ -197,6 +196,10 @@ rm -f $RPM_BUILD_ROOT/%{_sysconfdir}/dbus-1/system.d/org.rpm.conf
 %check
 %ifnarch loongarch64
 make check || (cat tests/rpmtests.log; exit 0)
+# rpmbuild will automatically remove the build directory since b34333fa.
+# But it fails to remove some directories, see the issue #1382. We need
+# to explictly make clean it after checking.
+make clean
 %endif
 
 %post -p /sbin/ldconfig
@@ -317,6 +320,9 @@ make check || (cat tests/rpmtests.log; exit 0)
 %exclude %{_mandir}/man8/rpmspec.8.gz
 
 %changelog
+* Mon Feb 06 2023 xujing<xujing125@huawei.com> - 4.18.0-3
+- make clean after check to adapt rpm upstream logic
+
 * Mon Feb 06 2023 xujing<xujing125@huawei.com> - 4.18.0-2
 - don't automatically execute rmbuild