Hello community,
here is the log from the commit of package apache-commons-collections for
openSUSE:Factory checked in at 2017-05-22 10:46:58
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/apache-commons-collections (Old)
and /work/SRC/openSUSE:Factory/.apache-commons-collections.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "apache-commons-collections"
Mon May 22 10:46:58 2017 rev:10 rq:496511 version:3.2.2
Changes:
--------
---
/work/SRC/openSUSE:Factory/apache-commons-collections/apache-commons-collections.changes
2015-12-21 12:04:56.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.apache-commons-collections.new/apache-commons-collections.changes
2017-05-22 10:48:25.928891500 +0200
@@ -1,0 +2,5 @@
+Fri May 19 08:49:50 UTC 2017 - [email protected]
+
+- Fix build with new javapackages-tools
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ apache-commons-collections.spec ++++++
--- /var/tmp/diff_new_pack.OoxcEz/_old 2017-05-22 10:48:26.508809763 +0200
+++ /var/tmp/diff_new_pack.OoxcEz/_new 2017-05-22 10:48:26.508809763 +0200
@@ -1,7 +1,7 @@
#
# spec file for package apache-commons-collections
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 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
@@ -37,6 +37,7 @@
BuildRequires: ant-junit
BuildRequires: apache-commons-parent
BuildRequires: java-devel
+BuildRequires: javapackages-local
BuildRequires: javapackages-tools
BuildRequires: junit
Provides: %{short_name} = %{version}-%{release}
@@ -103,12 +104,6 @@
sed -i 's/@VERSION@/%{version}/' pom-testframework.xml
%build
-#FIXME: the test fails on x390!
-#java: pthread_mutex_lock.c:71: __pthread_mutex_lock: Assertion
`mutex->__data.__owner == 0' failed.
-#ant -Djava.io.tmpdir=. test dist tf.javadoc
-#FIXME: the test fails on ppc with openjdk b11
-# See bnc#441085
-#ant -Djava.io.tmpdir=. dist tf.javadoc
export CLASSPATH=$(build-classpath junit)
ant \
-Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5 \
@@ -148,7 +143,11 @@
%{_javadir}/%{name}-testframework.jar
%{_javadir}/%{short_name}-testframework.jar
%{_mavenpomdir}/JPP-%{short_name}-testframework.pom
+%if %{?suse_version} > 1320
%{_datadir}/maven-metadata/%{name}-testframework.xml
+%else
+%config(noreplace) %{_mavendepmapfragdir}/%{name}-testframework
+%endif
%files javadoc
%defattr(0644,root,root,0755)
