From 123b837c20fe03af8ec3c2b94d01fc0f4037b45beac13a7580807591a3726cdd Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 15 May 2018 13:11:08 +0000 Subject: [PATCH 1/2] OBS-URL: https://build.opensuse.org/package/show/Java:packages/apache-commons-pool?expand=0&rev=12 --- apache-commons-pool.changes | 9 +++++++++ apache-commons-pool.spec | 6 ++++-- commons-pool-1.6-sourcetarget.patch | 4 ++-- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/apache-commons-pool.changes b/apache-commons-pool.changes index a7fdda6..c644b13 100644 --- a/apache-commons-pool.changes +++ b/apache-commons-pool.changes @@ -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 diff --git a/apache-commons-pool.spec b/apache-commons-pool.spec index aa15761..f5632e3 100644 --- a/apache-commons-pool.spec +++ b/apache-commons-pool.spec @@ -1,7 +1,7 @@ # # 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 # 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 Patch1: commons-pool-1.6-sourcetarget.patch BuildRequires: ant -BuildRequires: java-devel +BuildRequires: fdupes +BuildRequires: java-devel >= 1.8 BuildRequires: javapackages-tools BuildRequires: junit Provides: jakarta-commons-pool = %{version} @@ -78,6 +79,7 @@ install -m 644 dist/%{short_name}-%{version}-SNAPSHOT.jar %{buildroot}%{_javadir # javadoc install -d -m 755 %{buildroot}%{_javadocdir}/%{name} cp -pr dist/docs/api/* %{buildroot}%{_javadocdir}/%{name} +%fdupes -s %{buildroot}%{_javadocdir}/%{name} %files %defattr(0644,root,root,0755) diff --git a/commons-pool-1.6-sourcetarget.patch b/commons-pool-1.6-sourcetarget.patch index b1f32d6..f3639cf 100644 --- a/commons-pool-1.6-sourcetarget.patch +++ b/commons-pool-1.6-sourcetarget.patch @@ -6,8 +6,8 @@ - - -+ -+ ++ ++ From 93c525a52b071db8473b995a59e7109b63c390d801ca4fec426a0338dea1c9d6 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 17 May 2018 19:57:25 +0000 Subject: [PATCH 2/2] OBS-URL: https://build.opensuse.org/package/show/Java:packages/apache-commons-pool?expand=0&rev=13 --- apache-commons-pool.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apache-commons-pool.changes b/apache-commons-pool.changes index c644b13..f861aa1 100644 --- a/apache-commons-pool.changes +++ b/apache-commons-pool.changes @@ -4,7 +4,7 @@ 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 + removal of 1.6 compatibility - Run fdupes on the documentation -------------------------------------------------------------------