From 53d54c5f8da8a0f4f64342e6be3d6363feb13c9a Mon Sep 17 00:00:00 2001 From: xujing Date: Tue, 8 Nov 2022 17:34:35 +0800 Subject: [PATCH] rpmrebuild: fix -r does not work (cherry picked from commit c89b21424165ec636eaeabc9539e6324fea0651f) --- fix-r-does-not-work.patch | 25 +++++++++++++++++++++++++ rpmrebuild.spec | 9 ++++++++- 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 fix-r-does-not-work.patch diff --git a/fix-r-does-not-work.patch b/fix-r-does-not-work.patch new file mode 100644 index 0000000..d6de8ad --- /dev/null +++ b/fix-r-does-not-work.patch @@ -0,0 +1,25 @@ +From 5fb7daedd8ee3651f74382295e2983d5ca4707ff Mon Sep 17 00:00:00 2001 +From: xujing +Date: Tue, 8 Nov 2022 10:53:03 +0800 +Subject: [PATCH] fix -r does not work + +--- + rpmrebuild_parser.src | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/rpmrebuild_parser.src b/rpmrebuild_parser.src +index 1b1b8be..e244a8d 100755 +--- a/rpmrebuild_parser.src ++++ b/rpmrebuild_parser.src +@@ -1243,7 +1243,7 @@ function CommandLineParsing + + export LONG_OPTION + +- while getopts "5a:bc:d:D:ef:hi:Iklm:npPRrs:vVwy:-:" opt; do ++ while getopts "5a:bc:d:D:ef:hi:Iklm:npPRr:s:vVwy:-:" opt; do + OPTIND_INCR="" + case "$opt" in + 5) LONG_OPTION="md5-compat-digest";; +-- +2.27.0 + diff --git a/rpmrebuild.spec b/rpmrebuild.spec index 6811dcd..007c0ac 100644 --- a/rpmrebuild.spec +++ b/rpmrebuild.spec @@ -1,6 +1,6 @@ Name: rpmrebuild Version: 2.16 -Release: 7 +Release: 8 Summary: A tool to build a rpm file from the rpm database License: GPLv2+ URL: http://rpmrebuild.sourceforge.net @@ -12,6 +12,7 @@ Patch9002: fix-k-may-not-keep-uid-or-gid.patch Patch9003: fix-spelling-errors-that-could-mislead-users.patch Patch9004: fix-cap-from-fs-does-not-work.patch Patch9005: fix-comment-missing-n-does-not-work.patch +Patch9006: fix-r-does-not-work.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -63,6 +64,12 @@ rm -rf $RPM_BUILD_ROOT%{_mandir}/fr_FR.UTF-8/man1/ %{_mandir}/fr/man1/*.gz %changelog +* Tue Nov 8 2022 xujing - 2.16-8 +- Type:bugfix +- CVE:NA +- SUG:NA +- DESC:fix -r does not work + * Tue Nov 8 2022 xujing - 2.16-7 - Type:bugfix - CVE:NA