From f494c7d6d83394104772c2b9c77cb813f703608f67762dc5fdc27502b2835407 Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Tue, 15 May 2018 13:20:26 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/apache-commons-pool2?expand=0&rev=13

---
 apache-commons-pool2.changes |  7 +++++++
 apache-commons-pool2.spec    | 10 +++++++---
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/apache-commons-pool2.changes b/apache-commons-pool2.changes
index c5e90b3..fa8f291 100644
--- a/apache-commons-pool2.changes
+++ b/apache-commons-pool2.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue May 15 13:19:59 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
+
 -------------------------------------------------------------------
 Thu Sep 14 14:55:25 UTC 2017 - fstrba@suse.com
 
diff --git a/apache-commons-pool2.spec b/apache-commons-pool2.spec
index 4e14b3c..5cfeb34 100644
--- a/apache-commons-pool2.spec
+++ b/apache-commons-pool2.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package apache-commons-pool2
 #
-# 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
 BuildRequires:  ant
 BuildRequires:  cglib
-BuildRequires:  java-devel
+BuildRequires:  fdupes
+BuildRequires:  java-devel >= 1.8
 BuildRequires:  javapackages-tools
 BuildRequires:  junit
 Requires:       cglib
@@ -65,7 +66,9 @@ find . -name "*.jar" -exec rm -f {} \;
 
 %build
 echo "cglib.jar=$(build-classpath cglib)" >> build.properties
-ant -Djava.io.tmpdir=. clean dist
+ant \
+    -Djavac.target.version=8 -Djavac.src.version=8 \
+    -Djava.io.tmpdir=. clean dist
 
 %install
 # jars
@@ -76,6 +79,7 @@ install -m 644 dist/%{short_name}-%{version}.jar %{buildroot}%{_javadir}/%{name}
 # javadoc
 install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
 cp -pr dist/docs/api/* %{buildroot}%{_javadocdir}/%{name}
+%fdupes -s %{buildroot}%{_javadocdir}/%{name}
 
 %files
 %doc README.txt LICENSE.txt