Accepting request 620748 from Java:packages

Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/620748
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/apache-commons-dbcp?expand=0&rev=3

apache-commons-dbcp-javadoc.patch

@@ -0,0 +1,11 @@
+--- commons-dbcp2-2.1.1-src/build.xml	2018-05-15 11:17:10.227422992 +0200
++++ commons-dbcp2-2.1.1-src/build.xml	2018-05-15 11:24:49.257464289 +0200
+@@ -145,8 +146,6 @@
+                nohelp="true"
+                nonavbar="false"
+                serialwarn="false">
+-          <link href="http://docs.oracle.com/javase/7/docs/api/"/>
+-          <link href="http://commons.apache.org/pool/apidocs"/>
+       </javadoc>
+    </target>
+ 

apache-commons-dbcp-sourcetarget.patch

@@ -0,0 +1,32 @@
+--- commons-dbcp2-2.1.1-src/build.xml	2018-05-15 11:17:10.227422992 +0200
++++ commons-dbcp2-2.1.1-src/build.xml	2018-05-15 11:24:49.257464289 +0200
+@@ -58,7 +58,8 @@
+       <property name="src.java.dir" value="${src.dir}/main/java"/>
+       <property name="src.resource.dir" value="${src.dir}/main/resources"/>
+       <property name="src.test.dir" value="${src.dir}/test/java"/>
+-      <property name="javac.source" value="1.7" />
++      <property name="javac.source" value="8" />
++      <property name="javac.target" value="8" />
+ 
+       <property name="test.failonerror" value="true" /> 
+       <property name="test.runner" value="junit.textui.TestRunner" /> 
+@@ -161,7 +160,8 @@
+              debug="${javac.debug}"
+              deprecation="${javac.deprecation}"
+              optimize="${javac.optimize}"
+-             source="${javac.source}">
++             source="${javac.source}"
++             target="${javac.target}">
+       </javac>
+       <copy todir="${build.classes.dir}" >
+         <fileset dir="${src.resource.dir}"/>
+@@ -176,7 +176,8 @@
+              includeantruntime="false"
+              deprecation="${javac.deprecation}"
+              optimize="${javac.optimize}"
+-             source="${javac.source}">
++             source="${javac.source}"
++             target="${javac.target}">
+         <classpath>
+           <pathelement location="${build.classes.dir}" /> 
+           <pathelement location="${build.test-classes.dir}" /> 

apache-commons-dbcp.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Tue May 15 09:30:50 UTC 2018 - fstrba@suse.com
+
+- Added patches:
+  * apache-commons-dbcp-sourcetarget.patch
+    + build with java source / target 8 to align with other
+	  packages
+  * apache-commons-dbcp-javadoc.patch
+    + do not attempt to load urls while building
+
 -------------------------------------------------------------------
 Mon Oct 31 13:42:53 UTC 2016 - tchvatal@suse.com
 

apache-commons-dbcp.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package apache-commons-dbcp
 #
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -28,11 +28,14 @@ Url:            https://commons.apache.org/proper/commons-dbcp/
 Source0:        http://www.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz
 Source100:      http://www.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz.asc
 Source101:      commons.keyring
+Patch0:         apache-commons-dbcp-sourcetarget.patch
+Patch1:         apache-commons-dbcp-javadoc.patch
 BuildRequires:  ant >= 1.6.5
 BuildRequires:  apache-commons-logging
 BuildRequires:  apache-commons-pool2
+BuildRequires:  fdupes
 BuildRequires:  geronimo-jta-1_1-api
-BuildRequires:  java-devel
+BuildRequires:  java-devel >= 1.7
 BuildRequires:  javapackages-tools
 BuildRequires:  jdbc-stdext >= 2.0
 BuildRequires:  junit >= 3.8.1
@@ -76,6 +79,8 @@ features.
 
 %prep
 %setup -q -n %{short_name}-%{version}-src
+%patch0 -p1
+%patch1 -p1
 # remove all binary libs
 find . -name "*.jar" -exec rm -f {} \;
 
@@ -100,6 +105,7 @@ install -m 644 dist/%{short_name}-%{version}.jar %{buildroot}%{_javadir}/%{name}
 # javadoc
 install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
 cp -pr dist/docs/* %{buildroot}%{_javadocdir}/%{name}
+%fdupes -s %{buildroot}%{_javadocdir}/%{name}
 # hibernate_jdbc_cache ghost symlink
 mkdir -p %{buildroot}%{_sysconfdir}/alternatives/
 ln -sf %{_sysconfdir}/alternatives/hibernate_jdbc_cache.jar %{buildroot}%{_javadir}/hibernate_jdbc_cache.jar