From de24a6cc544e483a69ee984dd159f094f36d307c485166c90df36e3e396a3501 Mon Sep 17 00:00:00 2001 From: Kyrill Detinov Date: Wed, 21 Feb 2024 13:28:41 +0000 Subject: [PATCH 1/2] Accepting request 1148209 from home:dimstar:rpm4.20:u Prepare for RPM 4.20 OBS-URL: https://build.opensuse.org/request/show/1148209 OBS-URL: https://build.opensuse.org/package/show/Archiving/unzip?expand=0&rev=62 --- unzip-rcc.spec | 44 ++++++++++++++++++++++---------------------- unzip.spec | 44 ++++++++++++++++++++++---------------------- 2 files changed, 44 insertions(+), 44 deletions(-) diff --git a/unzip-rcc.spec b/unzip-rcc.spec index 386f269..8b16f02 100644 --- a/unzip-rcc.spec +++ b/unzip-rcc.spec @@ -91,30 +91,30 @@ functionality. This version can also extract encrypted archives. %prep %setup -q -n %{_name}%{fileversion} -%patch0 -%patch1 -%patch3 -%patch4 -%patch5 -%patch8 +%patch -P 0 +%patch -P 1 +%patch -P 3 +%patch -P 4 +%patch -P 5 +%patch -P 8 %if %{with rcc} -%patch10 +%patch -P 10 %endif -%patch11 -%patch12 -%patch13 -p1 -%patch14 -p1 -%patch15 -p1 -%patch16 -p1 -%patch17 -p1 -%patch18 -p1 -%patch19 -p0 -%patch20 -p1 -%patch21 -p1 -%patch22 -p1 -%patch23 -p1 -%patch24 -p1 -%patch25 -p1 +%patch -P 11 +%patch -P 12 +%patch -P 13 -p1 +%patch -P 14 -p1 +%patch -P 15 -p1 +%patch -P 16 -p1 +%patch -P 17 -p1 +%patch -P 18 -p1 +%patch -P 19 -p0 +%patch -P 20 -p1 +%patch -P 21 -p1 +%patch -P 22 -p1 +%patch -P 23 -p1 +%patch -P 24 -p1 +%patch -P 25 -p1 %build export RPM_OPT_FLAGS="%{optflags} \ diff --git a/unzip.spec b/unzip.spec index 2df414e..20dd8b7 100644 --- a/unzip.spec +++ b/unzip.spec @@ -91,30 +91,30 @@ functionality. This version can also extract encrypted archives. %prep %setup -q -n %{_name}%{fileversion} -%patch0 -%patch1 -%patch3 -%patch4 -%patch5 -%patch8 +%patch -P 0 +%patch -P 1 +%patch -P 3 +%patch -P 4 +%patch -P 5 +%patch -P 8 %if %{with rcc} -%patch10 +%patch -P 10 %endif -%patch11 -%patch12 -%patch13 -p1 -%patch14 -p1 -%patch15 -p1 -%patch16 -p1 -%patch17 -p1 -%patch18 -p1 -%patch19 -p0 -%patch20 -p1 -%patch21 -p1 -%patch22 -p1 -%patch23 -p1 -%patch24 -p1 -%patch25 -p1 +%patch -P 11 +%patch -P 12 +%patch -P 13 -p1 +%patch -P 14 -p1 +%patch -P 15 -p1 +%patch -P 16 -p1 +%patch -P 17 -p1 +%patch -P 18 -p1 +%patch -P 19 -p0 +%patch -P 20 -p1 +%patch -P 21 -p1 +%patch -P 22 -p1 +%patch -P 23 -p1 +%patch -P 24 -p1 +%patch -P 25 -p1 %build export RPM_OPT_FLAGS="%{optflags} \ From 30813c99ea9b7c11c89901e95fb06c7097eaf865cdff58319a59335a362be390 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Thu, 22 Feb 2024 13:17:10 +0000 Subject: [PATCH 2/2] Accepting request 1148777 from home:dimstar:Factory - Use %patch -P N instead of deprecated %patchN. - Use %patch -P N instead of deprecated %patchN. OBS-URL: https://build.opensuse.org/request/show/1148777 OBS-URL: https://build.opensuse.org/package/show/Archiving/unzip?expand=0&rev=63 --- pre_checkin.sh | 2 +- unzip-rcc.changes | 5 +++++ unzip-rcc.spec | 4 ++-- unzip.changes | 5 +++++ unzip.spec | 4 ++-- 5 files changed, 15 insertions(+), 5 deletions(-) diff --git a/pre_checkin.sh b/pre_checkin.sh index 37850ad..755f2be 100644 --- a/pre_checkin.sh +++ b/pre_checkin.sh @@ -6,5 +6,5 @@ cp unzip.changes unzip-rcc.changes sed -i -e 's,Name: .*,Name: unzip-rcc,' unzip-rcc.spec sed -i -e 's,%bcond_with rcc,%bcond_without rcc,' unzip-rcc.spec -osc service localrun format_spec_file +osc service run format_spec_file diff --git a/unzip-rcc.changes b/unzip-rcc.changes index 27a39ee..f08bf2c 100644 --- a/unzip-rcc.changes +++ b/unzip-rcc.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Feb 21 15:26:04 UTC 2024 - Dominique Leuenberger + +- Use %patch -P N instead of deprecated %patchN. + ------------------------------------------------------------------- Mon Sep 26 09:17:32 UTC 2022 - Danilo Spinella diff --git a/unzip-rcc.spec b/unzip-rcc.spec index 8b16f02..ae580e4 100644 --- a/unzip-rcc.spec +++ b/unzip-rcc.spec @@ -1,7 +1,7 @@ # # spec file for package unzip-rcc # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -66,7 +66,7 @@ Patch24: CVE-2022-0530.patch # PATCH-FIX-UPSTREAM danilo.spinella@suse.com CVE-2022-0529 bsc#1196180 Patch25: CVE-2022-0529.patch Requires(post): update-alternatives -Requires(postun):update-alternatives +Requires(postun): update-alternatives Recommends: %{_name}-doc BuildRoot: %{_tmppath}/%{name}-%{version}-build diff --git a/unzip.changes b/unzip.changes index 27a39ee..f08bf2c 100644 --- a/unzip.changes +++ b/unzip.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Feb 21 15:26:04 UTC 2024 - Dominique Leuenberger + +- Use %patch -P N instead of deprecated %patchN. + ------------------------------------------------------------------- Mon Sep 26 09:17:32 UTC 2022 - Danilo Spinella diff --git a/unzip.spec b/unzip.spec index 20dd8b7..d6e3027 100644 --- a/unzip.spec +++ b/unzip.spec @@ -1,7 +1,7 @@ # # spec file for package unzip # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -66,7 +66,7 @@ Patch24: CVE-2022-0530.patch # PATCH-FIX-UPSTREAM danilo.spinella@suse.com CVE-2022-0529 bsc#1196180 Patch25: CVE-2022-0529.patch Requires(post): update-alternatives -Requires(postun):update-alternatives +Requires(postun): update-alternatives Recommends: %{_name}-doc BuildRoot: %{_tmppath}/%{name}-%{version}-build