From e6a6b54fc8ed88dc44d9ce74210b5993f399e6da0cce2a732cd25096fe986511 Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Wed, 25 Oct 2023 16:40:00 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/apache-commons-dbcp1?expand=0&rev=11

---
 apache-commons-dbcp-sourcetarget.patch | 10 ++++++----
 apache-commons-dbcp1.changes           |  8 ++++++++
 apache-commons-dbcp1.spec              |  6 +++---
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/apache-commons-dbcp-sourcetarget.patch b/apache-commons-dbcp-sourcetarget.patch
index ff4a76b..7021873 100644
--- a/apache-commons-dbcp-sourcetarget.patch
+++ b/apache-commons-dbcp-sourcetarget.patch
@@ -13,27 +13,29 @@
        <property name="src.java.dir" value="${src.dir}/java"/>
        <property name="src.test.dir" value="${src.dir}/test"/>
 -      <property name="javac.source" value="1.5" />
-+      <property name="javac.source" value="1.7" />
-+      <property name="javac.target" value="1.7" />
++      <property name="javac.source" value="8" />
++      <property name="javac.target" value="8" />
     </target>
  
     <target name="prepare" depends="init,prepare-nojdbc4,prepare-jdbc4"/>
-@@ -194,7 +196,8 @@
+@@ -194,7 +196,9 @@
               debug="${javac.debug}"
               deprecation="${javac.deprecation}"
               optimize="${javac.optimize}"
 -             source="${javac.source}">
 +             source="${javac.source}"
++             release="${javac.target}"
 +             target="${javac.target}">
           <exclude name="org/apache/commons/dbcp/BasicDataSourceFactory.java"
               unless="jndi.present"/>
           <exclude name="org/apache/commons/dbcp/datasources/**"
-@@ -211,7 +214,8 @@
+@@ -211,7 +214,9 @@
               debug="${javac.debug}"
               deprecation="${javac.deprecation}"
               optimize="${javac.optimize}"
 -             source="${javac.source}">
 +             source="${javac.source}"
++             release="${javac.target}"
 +             target="${javac.target}">
          <classpath>
            <pathelement location="${build.classes.dir}" /> 
diff --git a/apache-commons-dbcp1.changes b/apache-commons-dbcp1.changes
index 8c58fd7..501c5af 100644
--- a/apache-commons-dbcp1.changes
+++ b/apache-commons-dbcp1.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Wed Oct 25 16:39:04 UTC 2023 - Fridrich Strba <fstrba@suse.com>
+
+- Modified patch:
+  * apache-commons-dbcp-sourcetarget.patch
+    + build with source target levels 8
+    + use "release" with compilers that support it
+
 -------------------------------------------------------------------
 Mon Apr 15 13:38:32 UTC 2019 - Fridrich Strba <fstrba@suse.com>
 
diff --git a/apache-commons-dbcp1.spec b/apache-commons-dbcp1.spec
index 5f0a129..2ed75fc 100644
--- a/apache-commons-dbcp1.spec
+++ b/apache-commons-dbcp1.spec
@@ -1,7 +1,7 @@
 #
-# spec file for package apache-commons-dbcp1
+# spec file
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2023 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -45,7 +45,7 @@ Requires:       commons-collections >= 3.2
 Requires:       commons-pool
 Requires:       jta_api >= 1.1
 Requires(post): update-alternatives
-Requires(preun): update-alternatives
+Requires(preun):update-alternatives
 Provides:       %{short_name} = %{version}-%{release}
 Obsoletes:      %{short_name} < %{version}-%{release}
 Provides:       jakarta-%{short_name} = %{version}-%{release}