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

---
 apache-commons-daemon.changes | 7 +++++++
 apache-commons-daemon.spec    | 8 +++++---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/apache-commons-daemon.changes b/apache-commons-daemon.changes
index 092e3f9..addd4b3 100644
--- a/apache-commons-daemon.changes
+++ b/apache-commons-daemon.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue May 15 08:29:55 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 11:22:56 UTC 2017 - fstrba@suse.com
 
diff --git a/apache-commons-daemon.spec b/apache-commons-daemon.spec
index 617b821..74457d5 100644
--- a/apache-commons-daemon.spec
+++ b/apache-commons-daemon.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package apache-commons-daemon
 #
-# 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
@@ -33,7 +33,8 @@ Patch2:         apache-commons-daemon-ppc64.patch
 Patch3:         apache-commons-daemon-aarch64.patch
 BuildRequires:  ant
 BuildRequires:  apache-commons-parent
-BuildRequires:  java-devel
+BuildRequires:  fdupes
+BuildRequires:  java-devel >= 1.8
 BuildRequires:  javapackages-local
 BuildRequires:  javapackages-tools
 BuildRequires:  libcap-devel
@@ -97,7 +98,7 @@ make %{?_smp_mflags} clean
 make %{?_smp_mflags}
 popd
 ant \
-    -Dcompile.source=1.6 -Dcompile.target=1.6 \
+    -Dcompile.source=8 -Dcompile.target=8 \
     jar test javadoc
 
 %install
@@ -116,6 +117,7 @@ install -Dpm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
 # javadoc
 install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
 cp -pr dist/docs/api/* %{buildroot}%{_javadocdir}/%{name}
+%fdupes -s %{buildroot}%{_javadocdir}/%{name}
 
 %files
 %doc LICENSE.txt PROPOSAL.html NOTICE.txt RELEASE-NOTES.txt src/samples