rpm/apache-commons-pool
SHA256
1
0
Fork 0
forked from pool/apache-commons-pool
Code Pull Requests Activity

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

Browse Source
This commit is contained in:
Fridrich Strba 2018-05-15 13:11:08 +00:00 committed by Git OBS Bridge
parent 5abef60c47
commit 123b837c20
3 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
apache-commons-pool.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Tue May 15 13:05:26 UTC 2018 - fstrba@suse.com
- Modified patch:
* commons-pool-1.6-sourcetarget.patch
+ Build with source and target 8 to prepare for a possible
removal of 1.6 compatibility in OpenJDK 11
- Run fdupes on the documentation
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Sep 14 14:17:08 UTC 2017 - fstrba@suse.com Thu Sep 14 14:17:08 UTC 2017 - fstrba@suse.com

6
apache-commons-pool.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package apache-commons-pool # spec file for package apache-commons-pool
# #
# 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
@ -29,7 +29,8 @@ Source0: http://www.apache.org/dist/commons/%{base_name}/source/%{short_n
Patch0: jakarta-commons-pool-build.patch Patch0: jakarta-commons-pool-build.patch
Patch1: commons-pool-1.6-sourcetarget.patch Patch1: commons-pool-1.6-sourcetarget.patch
BuildRequires: ant BuildRequires: ant
BuildRequires: java-devel BuildRequires: fdupes
BuildRequires: java-devel >= 1.8
BuildRequires: javapackages-tools BuildRequires: javapackages-tools
BuildRequires: junit BuildRequires: junit
Provides: jakarta-commons-pool = %{version} Provides: jakarta-commons-pool = %{version}
@ -78,6 +79,7 @@ install -m 644 dist/%{short_name}-%{version}-SNAPSHOT.jar %{buildroot}%{_javadir
# javadoc # javadoc
install -d -m 755 %{buildroot}%{_javadocdir}/%{name} install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
cp -pr dist/docs/api/* %{buildroot}%{_javadocdir}/%{name} cp -pr dist/docs/api/* %{buildroot}%{_javadocdir}/%{name}
%fdupes -s %{buildroot}%{_javadocdir}/%{name}
%files %files
%defattr(0644,root,root,0755) %defattr(0644,root,root,0755)

4
commons-pool-1.6-sourcetarget.patch
View File

@ -6,8 +6,8 @@
<property name="javac.deprecation" value="true"/> <property name="javac.deprecation" value="true"/>
- <property name="javac.target.version" value="1.5"/> - <property name="javac.target.version" value="1.5"/>
- <property name="javac.src.version" value="1.5"/> - <property name="javac.src.version" value="1.5"/>
+ <property name="javac.target.version" value="1.6"/> + <property name="javac.target.version" value="8"/>
+ <property name="javac.src.version" value="1.6"/> + <property name="javac.src.version" value="8"/>
</target> </target>
<!-- ######################################################### --> <!-- ######################################################### -->