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

OBS-URL: https://build.opensuse.org/package/show/Java:packages/apache-commons-collections?expand=0&rev=23

Browse Source
This commit is contained in:
Fridrich Strba 2018-05-15 07:44:05 +00:00 committed by Git OBS Bridge
parent beac425be7
commit 19fe6f8abd
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
apache-commons-collections.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue May 15 07:37:07 UTC 2018 - fstrba@suse.com
- Build with source and target 8 to prepare for a possible removal
of 1.6 compatibility in OpenJDK 11
- Run fdupes on documentation
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Sep 29 08:12:33 UTC 2017 - fstrba@suse.com Fri Sep 29 08:12:33 UTC 2017 - fstrba@suse.com

11
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) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2018 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,7 +37,8 @@ Patch4: commons-collections-3.2.2-tf.javadoc.patch
BuildRequires: ant BuildRequires: ant
BuildRequires: ant-junit BuildRequires: ant-junit
BuildRequires: apache-commons-parent BuildRequires: apache-commons-parent
BuildRequires: java-devel BuildRequires: fdupes
BuildRequires: java-devel >= 1.8
BuildRequires: javapackages-local BuildRequires: javapackages-local
BuildRequires: javapackages-tools BuildRequires: javapackages-tools
BuildRequires: junit BuildRequires: junit
@ -108,8 +109,8 @@ sed -i 's/@VERSION@/%{version}/' pom-testframework.xml
%build %build
echo "junit.jar=$(build-classpath junit)" >>build.properties echo "junit.jar=$(build-classpath junit)" >>build.properties
ant \ ant \
-Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6 \ -Dant.build.javac.source=8 -Dant.build.javac.target=8 \
-Dant.build.javadoc.source=1.6 \ -Dant.build.javadoc.source=8 \
-Djava.io.tmpdir=. jar javadoc tf.validate tf.jar dist.bin dist.src tf.javadoc -Djava.io.tmpdir=. jar javadoc tf.validate tf.jar dist.bin dist.src tf.javadoc
%install %install
@ -128,10 +129,12 @@ install -Dpm 644 pom-testframework.xml %{buildroot}%{_mavenpomdir}/JPP-%{short_n
# javadoc # javadoc
install -d -m 755 %{buildroot}%{_javadocdir}/%{name} install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
cp -pr build/docs/apidocs/* %{buildroot}%{_javadocdir}/%{name} cp -pr build/docs/apidocs/* %{buildroot}%{_javadocdir}/%{name}
%fdupes -s %{buildroot}%{_javadocdir}/%{name}
# testframework-javadoc # testframework-javadoc
install -d -m 755 %{buildroot}%{_javadocdir}/%{name}-testframework install -d -m 755 %{buildroot}%{_javadocdir}/%{name}-testframework
cp -pr build/docs/testframework/* %{buildroot}%{_javadocdir}/%{name}-testframework cp -pr build/docs/testframework/* %{buildroot}%{_javadocdir}/%{name}-testframework
%fdupes -s %{buildroot}%{_javadocdir}/%{name}-testframework
%files %files
%defattr(0644,root,root,0755) %defattr(0644,root,root,0755)