From 43d4fcc4d6ddb1b00d798698d5b344036ecaa210fded63186a63f24abc635807 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 20 Feb 2024 12:53:46 +0000 Subject: [PATCH] Accepting request 1147834 from home:dimstar:rpm4.20:a Prepare for RPM 4.20 OBS-URL: https://build.opensuse.org/request/show/1147834 OBS-URL: https://build.opensuse.org/package/show/Java:packages/apache-commons-httpclient?expand=0&rev=27 --- apache-commons-httpclient.changes | 5 +++++ apache-commons-httpclient.spec | 14 +++++++------- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/apache-commons-httpclient.changes b/apache-commons-httpclient.changes index e40299d..b1bc1e4 100644 --- a/apache-commons-httpclient.changes +++ b/apache-commons-httpclient.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Feb 20 10:19:53 UTC 2024 - Dominique Leuenberger + +- Use %patch -P N instead of deprecated %patchN. + ------------------------------------------------------------------- Tue Oct 27 10:39:27 UTC 2020 - Pedro Monreal diff --git a/apache-commons-httpclient.spec b/apache-commons-httpclient.spec index ae174ff..efcfa1d 100644 --- a/apache-commons-httpclient.spec +++ b/apache-commons-httpclient.spec @@ -1,7 +1,7 @@ # # spec file for package apache-commons-httpclient # -# Copyright (c) 2020 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 @@ -103,17 +103,17 @@ Manual for %{name} mkdir lib # duh rm -rf docs/apidocs docs/*.patch docs/*.orig docs/*.rej -%patch0 +%patch -P 0 pushd src/conf sed -i 's/\r//' MANIFEST.MF -%patch1 +%patch -P 1 popd -%patch2 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 +%patch -P 2 +%patch -P 3 -p1 +%patch -P 4 -p1 +%patch -P 5 -p1 # Use javax classes, not com.sun ones # assume no filename contains spaces