Hello community,
here is the log from the commit of package apache-commons-dbcp for
openSUSE:Leap:15.2 checked in at 2020-02-05 07:23:00
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Leap:15.2/apache-commons-dbcp (Old)
and /work/SRC/openSUSE:Leap:15.2/.apache-commons-dbcp.new.26092 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "apache-commons-dbcp"
Wed Feb 5 07:23:00 2020 rev:10 rq:762697 version:2.1.1
Changes:
--------
---
/work/SRC/openSUSE:Leap:15.2/apache-commons-dbcp/apache-commons-dbcp.changes
2020-01-15 14:46:58.685277359 +0100
+++
/work/SRC/openSUSE:Leap:15.2/.apache-commons-dbcp.new.26092/apache-commons-dbcp.changes
2020-02-05 07:23:01.906585321 +0100
@@ -1,0 +2,27 @@
+Mon Apr 15 13:35:14 UTC 2019 - Fridrich Strba <fst...@suse.com>
+
+- Build classpath using directly geronimo-jta-1.1-api instead of
+ the jta symlink
+
+-------------------------------------------------------------------
+Mon Mar 25 17:39:46 UTC 2019 - Fridrich Strba <fst...@suse.com>
+
+- Remove pom parent, since we don't use it when not building with
+ maven
+
+-------------------------------------------------------------------
+Sat Dec 15 14:17:20 UTC 2018 - Fridrich Strba <fst...@suse.com>
+
+- Add maven pom file
+
+-------------------------------------------------------------------
+Tue May 15 09:30:50 UTC 2018 - fst...@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
+
+-------------------------------------------------------------------
New:
----
apache-commons-dbcp-javadoc.patch
apache-commons-dbcp-sourcetarget.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ apache-commons-dbcp.spec ++++++
--- /var/tmp/diff_new_pack.wWpQZV/_old 2020-02-05 07:23:02.494585569 +0100
+++ /var/tmp/diff_new_pack.wWpQZV/_new 2020-02-05 07:23:02.494585569 +0100
@@ -1,7 +1,7 @@
#
# spec file for package apache-commons-dbcp
#
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 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
@@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
@@ -24,16 +24,19 @@
Summary: Jakarta Commons DataBase Pooling Package
License: Apache-2.0
Group: Development/Libraries/Java
-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
+URL: https://commons.apache.org/proper/commons-dbcp/
+Source0:
http://archive.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz
+Source100:
http://archive.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: javapackages-tools
+BuildRequires: java-devel >= 1.7
+BuildRequires: javapackages-local
BuildRequires: jdbc-stdext >= 2.0
BuildRequires: junit >= 3.8.1
BuildRequires: xerces-j2
@@ -43,11 +46,10 @@
Requires(post): update-alternatives
Requires(preun): update-alternatives
Provides: %{short_name} = %{version}-%{release}
-Obsoletes: %{short_name} < %{version}
+Obsoletes: %{short_name} < %{version}-%{release}
Provides: hibernate_jdbc_cache
-Provides: jakarta-commons-dbcp = %{version}
-Obsoletes: jakarta-commons-dbcp < %{version}
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
+Provides: jakarta-%{short_name} = %{version}-%{release}
+Obsoletes: jakarta-%{short_name} < %{version}-%{release}
BuildArch: noarch
%description
@@ -60,7 +62,7 @@
features.
%package javadoc
-Summary: Javadoc for jakarta-commons-dbcp
+Summary: Javadoc for %{name}
Group: Development/Libraries/Java
%description javadoc
@@ -76,9 +78,13 @@
%prep
%setup -q -n %{short_name}-%{version}-src
+%patch0 -p1
+%patch1 -p1
# remove all binary libs
find . -name "*.jar" -exec rm -f {} \;
+%pom_remove_parent .
+
%build
ant \
-Dcommons-pool.jar=$(build-classpath commons-pool2) \
@@ -88,7 +94,7 @@
-Dxml-apis.jar=$(build-classpath xml-commons-jaxp-1.3-apis) \
-Dcommons-logging.jar=$(build-classpath commons-logging) \
-Djava.io.tmpdir=. \
- -Djta-impl.jar=$(build-classpath jta) \
+ -Djta-impl.jar=$(build-classpath geronimo-jta-1.1-api) \
dist
%install
@@ -97,9 +103,15 @@
install -m 644 dist/%{short_name}-%{version}.jar
%{buildroot}%{_javadir}/%{name}2-%{version}.jar
(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar}
`echo $jar| sed "s|apache-||g"`; done)
(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar}
`echo $jar| sed "s|-%{version}||g"`; done)
+# pom
+install -d -m 755 %{buildroot}%{_mavenpomdir}
+install -m 644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}2-%{version}.pom
+%add_maven_depmap %{name}2-%{version}.pom %{name}2-%{version}.jar
+
# 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
@@ -114,17 +126,21 @@
fi
%files
-%defattr(-,root,root)
-%doc LICENSE.txt
+%license LICENSE.txt
%{_javadir}/%{name}2.jar
%{_javadir}/%{name}2-%{version}.jar
%{_javadir}/%{short_name}.jar
%{_javadir}/%{short_name}-%{version}.jar
%{_javadir}/hibernate_jdbc_cache.jar
%ghost %{_sysconfdir}/alternatives/hibernate_jdbc_cache.jar
+%{_mavenpomdir}/%{name}2-%{version}.pom
+%if %{defined _maven_repository}
+%{_mavendepmapfragdir}/%{name}
+%else
+%{_datadir}/maven-metadata/%{name}.xml*
+%endif
%files javadoc
-%defattr(-,root,root)
-%doc %{_javadocdir}/%{name}
+%{_javadocdir}/%{name}
%changelog
++++++ apache-commons-dbcp-javadoc.patch ++++++
--- 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 ++++++
--- 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}" />
