From 81099f7e737d4143385a1fbe704e1d66b52111dd88356b4bb42b4e02ededb2cc Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 20 Feb 2024 13:00:14 +0000 Subject: [PATCH 1/2] Accepting request 1147832 from home:dimstar:rpm4.20:a Prepare for RPM 4.20 OBS-URL: https://build.opensuse.org/request/show/1147832 OBS-URL: https://build.opensuse.org/package/show/Java:packages/apache-commons-dbcp?expand=0&rev=27 --- apache-commons-dbcp.changes | 6 ++++++ apache-commons-dbcp.spec | 4 +--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/apache-commons-dbcp.changes b/apache-commons-dbcp.changes index adc6f8c..a6b6431 100644 --- a/apache-commons-dbcp.changes +++ b/apache-commons-dbcp.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Feb 20 11:04:20 UTC 2024 - Dominique Leuenberger + +- Use %autosetup macro. Allows to eliminate the usage of deprecated + %patchN. + ------------------------------------------------------------------- Mon Apr 15 13:35:14 UTC 2019 - Fridrich Strba diff --git a/apache-commons-dbcp.spec b/apache-commons-dbcp.spec index 6b74df6..f62bdbf 100644 --- a/apache-commons-dbcp.spec +++ b/apache-commons-dbcp.spec @@ -77,9 +77,7 @@ testing for valid connections, PreparedStatement pooling, and other features. %prep -%setup -q -n %{short_name}-%{version}-src -%patch0 -p1 -%patch1 -p1 +%autosetup -p1 -n %{short_name}-%{version}-src # remove all binary libs find . -name "*.jar" -exec rm -f {} \; From af7d5baa3e77a26cb663e4a0e31f842c927962946b6b7578a58c6a6317a9cee7 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 20 Feb 2024 13:00:45 +0000 Subject: [PATCH 2/2] OBS-URL: https://build.opensuse.org/package/show/Java:packages/apache-commons-dbcp?expand=0&rev=28 --- apache-commons-dbcp.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/apache-commons-dbcp.spec b/apache-commons-dbcp.spec index f62bdbf..11af4d2 100644 --- a/apache-commons-dbcp.spec +++ b/apache-commons-dbcp.spec @@ -1,7 +1,7 @@ # # spec file for package apache-commons-dbcp # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# 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 @@ -78,6 +78,7 @@ features. %prep %autosetup -p1 -n %{short_name}-%{version}-src + # remove all binary libs find . -name "*.jar" -exec rm -f {} \;