From 51d2aecdb01119f4cea0b87f5c701e2ec906074a Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Fri, 5 Jan 2024 17:29:07 +0100 Subject: [PATCH] fix typo error in last patch [release 4.18.0-4mamba;Fri Oct 28 2022] --- rpm-4.18.0-allow-disabling-rmbuild.patch | 15 +++++++++++++++ rpm.spec | 12 +++++++++--- 2 files changed, 24 insertions(+), 3 deletions(-) create mode 100644 rpm-4.18.0-allow-disabling-rmbuild.patch diff --git a/rpm-4.18.0-allow-disabling-rmbuild.patch b/rpm-4.18.0-allow-disabling-rmbuild.patch new file mode 100644 index 0000000..0e06830 --- /dev/null +++ b/rpm-4.18.0-allow-disabling-rmbuild.patch @@ -0,0 +1,15 @@ +--- rpm-4.18.0/build/build.c.orig 2022-10-27 17:01:14.118557647 +0200 ++++ rpm-4.18.0/build/build.c 2022-10-27 17:01:48.561414744 +0200 +@@ -155,9 +155,9 @@ + mCmd = "%{__spec_clean_cmd}"; + break; + case RPMBUILD_RMBUILD: +- mTemplate = "%{__spec_clean_template}"; +- mPost = "%{__spec_clean_post}"; +- mCmd = "%{__spec_clean_cmd}"; ++ mTemplate = "%{__spec_rmbuild_template}"; ++ mPost = "%{__spec_rmbuild_post}"; ++ mCmd = "%{__spec_rmbuild_cmd}"; + break; + case RPMBUILD_STRINGBUF: + default: diff --git a/rpm.spec b/rpm.spec index b34284f..f9da26b 100644 --- a/rpm.spec +++ b/rpm.spec @@ -17,7 +17,7 @@ Name: rpm Epoch: 1 Version: 4.18.0 -Release: 2mamba +Release: 4mamba Summary: The RPM Package Manager (RPM) is a powerful package management system Group: System/Management Vendor: openmamba @@ -45,6 +45,7 @@ Patch11: rpm-4.14.2.1-target-platform-gnu.patch Patch12: rpm-4.17.0-find-lang-qt-fix.patch Patch13: rpm-4.16.1.3-pythondistdeps-no-richdeps.patch Patch14: rpm-4.18.0-brp-strip-fix-for-plus-in-buildroot.patch +Patch15: rpm-4.18.0-allow-disabling-rmbuild.patch License: LGPL ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel @@ -60,7 +61,6 @@ BuildRequires: libdw-devel BuildRequires: libelf-devel BuildRequires: libgcrypt-devel BuildRequires: libgomp-devel -BuildRequires: libgpg-error-devel BuildRequires: liblua-devel BuildRequires: liblz4-devel BuildRequires: liblzma-devel @@ -72,7 +72,6 @@ BuildRequires: libpopt-devel BuildRequires: libpython3-devel BuildRequires: libreadline-devel BuildRequires: libsqlite-devel -BuildRequires: libxml2-devel BuildRequires: libz-devel BuildRequires: libzstd-devel ## AUTOBUILDREQ-END @@ -145,6 +144,7 @@ This package should be installed if you want to develop Python programs that wil %patch12 -p1 #%patch13 -p1 %patch14 -p1 +%patch15 -p1 #sed -i "s|/usr/bin/python$|%{__python3}|" scripts/pythondistdeps.py @@ -305,6 +305,12 @@ rm -f %{buildroot}%{_libdir}/librpm*.la %{python3_sitearch}/rpm/* %changelog +* Fri Oct 28 2022 Silvan Calarco 4.18.0-4mamba +- fix typo error in last patch + +* Thu Oct 27 2022 Silvan Calarco 4.18.0-3mamba +- added a patch to allow disabling rmbuild without disabling whole clean section + * Sun Oct 09 2022 Silvan Calarco 4.18.0-2mamba - brp-strip: added patch to fix exclusion of /usr/lib/debug when buildroot contains a plus (+) symbol