Accepting request 623086 from Java:packages

Adapt to the new OpenJDK 11

OBS-URL: https://build.opensuse.org/request/show/623086
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/dom4j?expand=0&rev=20

dom4j-javadoc.patch

@@ -0,0 +1,19 @@
+--- dom4j/build.xml	2009-05-12 15:04:18.000000000 +0200
++++ dom4j/build.xml	2018-07-10 10:51:51.814095475 +0200
+@@ -224,7 +224,6 @@
+              doctitle="${Name}"
+              bottom="Copyright © ${year} MetaStuff Ltd. All Rights Reserved. Hosted by <p> <img src='http://sourceforge.net/sflogo.php?group_id=16035' width='88' height='31' border='0' alt='SourceForge Logo' />"
+              stylesheetfile="${doc.dir}/style/javadoc.css">
+-      <link href="file:///usr/share/doc/classpath-doc/api"/>
+     </javadoc>
+ 
+     <mkdir dir="${build.apidocs}"/>
+@@ -240,8 +239,6 @@
+              doctitle="${Name}"
+              bottom="Copyright &#169; ${year} MetaStuff Ltd. All Rights Reserved. Hosted by &lt;p&gt; &lt;img src='http://sourceforge.net/sflogo.php?group_id=16035' width='88' height='31' border='0' alt='SourceForge Logo' /&gt;"
+              stylesheetfile="${doc.dir}/style/javadoc.css">
+-      <link href="file:///usr/share/doc/classpath-doc/api"/>
+-      <link href="${build.javadocs}"/>
+     </javadoc>
+   </target>
+ 

dom4j-sourcetarget.patch

@@ -6,8 +6,8 @@
             optimize="${optimize}"
 -           target="1.3"
 -           source="1.3"
-+           target="1.6"
++           target="8"
-+           source="1.6"
++           source="8"
             deprecation="${deprecation}"
             classpathref="compile.classpath">
  	<exclude name="org/dom4j/datatype/**"/>
@@ -15,7 +15,7 @@
      <mkdir dir="${build.javadocs}"/>
      <javadoc packagenames="${packages}"
               sourcepath="${build.src}"
-+             source="1.6"
++             source="8"
               destdir="${build.javadocs}"
               author="true"
               version="true"
@@ -23,7 +23,7 @@
      <mkdir dir="${build.javadocs}"/>
      <javadoc packagenames="${packages}"
               sourcepath="${build.src}"
-+             source="1.6"
++             source="8"
               destdir="${build.javadocs}"
               author="true"
               version="true"
@@ -31,7 +31,7 @@
      <mkdir dir="${build.apidocs}"/>
      <javadoc packagenames="${api.packages}"
               sourcepath="${build.src}"
-+             source="1.6"
++             source="8"
               destdir="${build.apidocs}"
               author="true"
               version="true"

dom4j.changes

@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Tue Jul 10 12:41:17 UTC 2018 - fstrba@suse.com
+
+- Added patch:
+  * dom4j-javadoc.patch
+    + Don't load urls while building javadoc in environment without
+      connectivity
+
+-------------------------------------------------------------------
+Wed May 16 11:56:27 UTC 2018 - fstrba@suse.com
+
+- Modified patch:
+  * dom4j-sourcetarget.patch
+    + Build with source and target 8 to prepare for a possible
+      removal of 1.6 compatibility
+
 -------------------------------------------------------------------
 Fri Sep  8 05:47:14 UTC 2017 - fstrba@suse.com
 

dom4j.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package dom4j
 #
-# 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
@@ -36,10 +36,12 @@ Source1:        dom4j_rundemo.sh
 Source2:        http://repo1.maven.org/maven2/dom4j/dom4j/1.6.1/dom4j-1.6.1.pom
 Patch0:         dom4j-1.6.1-bug1618750.patch
 Patch1:         dom4j-sourcetarget.patch
+Patch2:         dom4j-javadoc.patch
 BuildRequires:  ant >= 1.6.5
 BuildRequires:  ant-apache-resolver
 BuildRequires:  ant-junit
 BuildRequires:  bea-stax
+BuildRequires:  fdupes
 BuildRequires:  isorelax
 BuildRequires:  java-devel >= 1.6
 # Needed for maven conversions
@@ -127,6 +129,7 @@ rm -f src/test/org/dom4j/ThreadingTest.java
 rm -f src/test/org/dom4j/io/StaxTest.java
 %patch0 -p1 -b .bug1618750
 %patch1 -p1 -b .sourcetarget
+%patch2 -p1 -b .javadoc
 perl -pi -e 's/\r//g' LICENSE.txt docs/clover/*.css docs/style/*.css docs/xref/*.css docs/xref-test/*.css src/doc/style/*.css docs/benchmarks/xpath/*.java
 
 pushd lib
@@ -186,6 +189,9 @@ mkdir -p %{buildroot}%{_datadir}/%{name}/src
 cp -pr src/samples %{buildroot}%{_datadir}/%{name}/src
 #cp -pr build/classes/org/dom4j/samples $RPM_BUILD_ROOT%{_datadir}/%{name}/classes/org/dom4j
 install -m 0755 run.sh %{buildroot}%{_datadir}/%{name}
+%fdupes -s %{buildroot}%{_javadocdir}/%{name}
+%fdupes -s %{buildroot}%{_docdir}/%{name}-%{version}
+%fdupes -s %{buildroot}%{_datadir}/%{name}
 
 %files
 %defattr(0644,root,root,0755)