From 049ed93ed232cfa1afa2a4f41f5256f1d3be37c88c27d01648301dd7c42d9559 Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Wed, 16 May 2018 09:03:07 +0000
Subject: [PATCH 1/2] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/cal10n?expand=0&rev=14

---
 cal10n-0.7.7-sourcetarget.patch | 10 +++++-----
 cal10n.changes                  |  9 +++++++++
 cal10n.spec                     |  6 ++++--
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/cal10n-0.7.7-sourcetarget.patch b/cal10n-0.7.7-sourcetarget.patch
index cbc0e68..d9b4524 100644
--- a/cal10n-0.7.7-sourcetarget.patch
+++ b/cal10n-0.7.7-sourcetarget.patch
@@ -5,11 +5,11 @@
             optimize="false" 
             deprecation="true" 
 -           target="1.5" 
-+           target="1.6" 
++           target="8" 
             verbose="false" 
             fork="false" 
 -           source="1.5">
-+           source="1.6">
++           source="8">
        <src>
          <pathelement location="${maven.build.srcDir.0}"/>
        </src>
@@ -18,11 +18,11 @@
             optimize="false" 
             deprecation="true" 
 -           target="1.5" 
-+           target="1.6" 
++           target="8" 
             verbose="false" 
             fork="false" 
 -           source="1.5">
-+           source="1.6">
++           source="8">
        <src>
          <pathelement location="${maven.build.testDir.0}"/>
        </src>
@@ -31,7 +31,7 @@
               linksource="false" 
               breakiterator="false">
 -      <link href="http://java.sun.com/j2se/1.5.0/docs/api"/>
-+      <link href="http://java.sun.com/j2se/1.6.0/docs/api"/>
++      <link href="http://java.sun.com/j2se/1.8.0/docs/api"/>
        <group title="CAL10N API packages"/>
        <group title="CAL10N Maven plugin"/>
      </javadoc>
diff --git a/cal10n.changes b/cal10n.changes
index 7a84861..ceb6786 100644
--- a/cal10n.changes
+++ b/cal10n.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Wed May 16 09:00:43 UTC 2018 - fstrba@suse.com
+
+- Modified patch:
+  * cal10n-0.7.7-sourcetarget.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  7 17:45:17 UTC 2017 - fstrba@suse.com
 
diff --git a/cal10n.spec b/cal10n.spec
index 8768364..dd8f401 100644
--- a/cal10n.spec
+++ b/cal10n.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package cal10n
 #
-# 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
@@ -27,7 +27,8 @@ Source0:        http://cal10n.qos.ch/dist/cal10n-%{version}.tar.gz
 Source1:        build.xml-0.7.7.tar.xz
 Patch0:         cal10n-0.7.7-sourcetarget.patch
 BuildRequires:  ant
-BuildRequires:  java-devel
+BuildRequires:  fdupes
+BuildRequires:  java-devel >= 1.8
 BuildRequires:  junit
 BuildRequires:  xz
 Requires:       java
@@ -95,6 +96,7 @@ install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}-%{version}
 cp -pr target/site/apidocs*/* %{buildroot}%{_javadocdir}/%{name}-%{version}/
 rm -rf target/site/api*
 popd
+%fdupes -s %{buildroot}%{_javadocdir}/%{name}-%{version}
 
 %files
 %defattr(0644,root,root,0755)

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

---
 cal10n.changes | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cal10n.changes b/cal10n.changes
index ceb6786..c7885c1 100644
--- a/cal10n.changes
+++ b/cal10n.changes
@@ -4,7 +4,7 @@ Wed May 16 09:00:43 UTC 2018 - fstrba@suse.com
 - Modified patch:
   * cal10n-0.7.7-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 documentation
 
 -------------------------------------------------------------------