pool/apache-commons-collections
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 496511 from Java:packages

Browse Source 
- Fix build with new javapackages-tools

OBS-URL: https://build.opensuse.org/request/show/496511
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/apache-commons-collections?expand=0&rev=10
This commit is contained in:
Dominique Leuenberger 2017-05-22 08:46:58 +00:00 committed by Git OBS Bridge
commit 6592f749ef
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apache-commons-collections.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri May 19 08:49:50 UTC 2017 - tchvatal@suse.com
- Fix build with new javapackages-tools
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Dec 17 18:24:36 UTC 2015 - tchvatal@suse.com Thu Dec 17 18:24:36 UTC 2015 - tchvatal@suse.com

13
apache-commons-collections.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package apache-commons-collections # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -37,6 +37,7 @@ BuildRequires: ant
BuildRequires: ant-junit BuildRequires: ant-junit
BuildRequires: apache-commons-parent BuildRequires: apache-commons-parent
BuildRequires: java-devel BuildRequires: java-devel
BuildRequires: javapackages-local
BuildRequires: javapackages-tools BuildRequires: javapackages-tools
BuildRequires: junit BuildRequires: junit
Provides: %{short_name} = %{version}-%{release} Provides: %{short_name} = %{version}-%{release}
@ -103,12 +104,6 @@ cp -p %{SOURCE1} pom-testframework.xml
sed -i 's/@VERSION@/%{version}/' pom-testframework.xml sed -i 's/@VERSION@/%{version}/' pom-testframework.xml
%build %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) export CLASSPATH=$(build-classpath junit)
ant \ ant \
-Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5 \ -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5 \
@ -148,7 +143,11 @@ cp -pr build/docs/testframework/* %{buildroot}%{_javadocdir}/%{name}-testframewo
%{_javadir}/%{name}-testframework.jar %{_javadir}/%{name}-testframework.jar
%{_javadir}/%{short_name}-testframework.jar %{_javadir}/%{short_name}-testframework.jar
%{_mavenpomdir}/JPP-%{short_name}-testframework.pom %{_mavenpomdir}/JPP-%{short_name}-testframework.pom
%if %{?suse_version} > 1320
%{_datadir}/maven-metadata/%{name}-testframework.xml %{_datadir}/maven-metadata/%{name}-testframework.xml
%else
%config(noreplace) %{_mavendepmapfragdir}/%{name}-testframework
%endif
%files javadoc %files javadoc
%defattr(0644,root,root,0755) %defattr(0644,root,root,0755)