From 05cd986334233522778c2228feac3641a0381192453e954324f1dc275ef09901 Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Tue, 15 May 2018 06:06:42 +0000
Subject: [PATCH 1/2] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/apache-commons-beanutils?expand=0&rev=11

---
 apache-commons-beanutils.changes | 9 +++++++++
 apache-commons-beanutils.spec    | 4 +++-
 jdk9.patch                       | 4 ++--
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/apache-commons-beanutils.changes b/apache-commons-beanutils.changes
index 96b0e56..41a138d 100644
--- a/apache-commons-beanutils.changes
+++ b/apache-commons-beanutils.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Tue May 15 06:03:11 UTC 2018 - fstrba@suse.com
+
+- Modified patch:
+  * jdk9.patch
+    + 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 09:25:26 UTC 2017 - fstrba@suse.com
 
diff --git a/apache-commons-beanutils.spec b/apache-commons-beanutils.spec
index 14ce637..0d3b42a 100644
--- a/apache-commons-beanutils.spec
+++ b/apache-commons-beanutils.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package apache-commons-beanutils
 #
-# 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
@@ -30,6 +30,7 @@ Patch0:         jdk9.patch
 BuildRequires:  ant
 BuildRequires:  commons-collections
 BuildRequires:  commons-logging
+BuildRequires:  fdupes
 BuildRequires:  xml-commons-apis
 Requires:       commons-collections >= 2.0
 Requires:       commons-logging >= 1.0
@@ -87,6 +88,7 @@ install -pm 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
 %defattr(0644,root,root,0755)
diff --git a/jdk9.patch b/jdk9.patch
index 661781c..acd5bc0 100644
--- a/jdk9.patch
+++ b/jdk9.patch
@@ -5,11 +5,11 @@
  
    <!-- Compiler source JDK version -->
 -  <property name="compile.source"          value="1.5"/>
-+  <property name="compile.source"          value="1.6"/>
++  <property name="compile.source"          value="8"/>
  
    <!-- Compiler target JDK version -->
 -  <property name="compile.target"          value="1.5"/>
-+  <property name="compile.target"          value="1.6"/>
++  <property name="compile.target"          value="8"/>
  
    <!-- Should Java compilations set the 'debug' compiler option? -->
    <property name="compile.debug"           value="true"/>

From f1a09a03c25f1c1cb0ba7e1965b816033d2e4f2d8d8062e2b49b908776b6e1ed Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Thu, 17 May 2018 19:56:51 +0000
Subject: [PATCH 2/2] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/apache-commons-beanutils?expand=0&rev=12

---
 apache-commons-beanutils.changes | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apache-commons-beanutils.changes b/apache-commons-beanutils.changes
index 41a138d..14a65e4 100644
--- a/apache-commons-beanutils.changes
+++ b/apache-commons-beanutils.changes
@@ -4,7 +4,7 @@ Tue May 15 06:03:11 UTC 2018 - fstrba@suse.com
 - Modified patch:
   * jdk9.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 documentation
 
 -------------------------------------------------------------------