From fa92fc9b6933384f04ba7ddfc12afc99ef23182eae0fa34e033b11736d019d57 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Wed, 16 May 2018 11:57:59 +0000 Subject: [PATCH 1/4] OBS-URL: https://build.opensuse.org/package/show/Java:packages/dom4j?expand=0&rev=20 --- dom4j-sourcetarget.patch | 10 +++++----- dom4j.changes | 8 ++++++++ dom4j.spec | 2 +- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/dom4j-sourcetarget.patch b/dom4j-sourcetarget.patch index 51c8eb2..1644b75 100644 --- a/dom4j-sourcetarget.patch +++ b/dom4j-sourcetarget.patch @@ -6,8 +6,8 @@ optimize="${optimize}" - target="1.3" - source="1.3" -+ target="1.6" -+ source="1.6" ++ target="8" ++ source="8" deprecation="${deprecation}" classpathref="compile.classpath"> @@ -15,7 +15,7 @@ Date: Thu, 17 May 2018 19:54:06 +0000 Subject: [PATCH 2/4] OBS-URL: https://build.opensuse.org/package/show/Java:packages/dom4j?expand=0&rev=21 --- dom4j.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dom4j.changes b/dom4j.changes index 526438e..293faa4 100644 --- a/dom4j.changes +++ b/dom4j.changes @@ -4,7 +4,7 @@ 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 in OpenJDK 11 + removal of 1.6 compatibility ------------------------------------------------------------------- Fri Sep 8 05:47:14 UTC 2017 - fstrba@suse.com From 106046f7bac30974eaeb5a1ec44d3f39e891b3056282b6f12b4900957feab533 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 10 Jul 2018 12:44:23 +0000 Subject: [PATCH 3/4] OBS-URL: https://build.opensuse.org/package/show/Java:packages/dom4j?expand=0&rev=22 --- dom4j-javadoc.patch | 19 +++++++++++++++++++ dom4j.changes | 12 +++++++++++- dom4j.spec | 7 +++++++ 3 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 dom4j-javadoc.patch diff --git a/dom4j-javadoc.patch b/dom4j-javadoc.patch new file mode 100644 index 0000000..895211b --- /dev/null +++ b/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"> +- + + + +@@ -240,8 +239,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"> +- +- + + + diff --git a/dom4j.changes b/dom4j.changes index 293faa4..159f36c 100644 --- a/dom4j.changes +++ b/dom4j.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Tue Jul 10 12:41:17 UTC 2018 - fstrba@suse.com + +- Don't build classes depending on Java EE classes removed in + OpenJDK 11 +- 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 @@ -18,7 +28,7 @@ Fri Sep 8 05:47:14 UTC 2017 - fstrba@suse.com Fri May 19 09:03:12 UTC 2017 - mpluskal@suse.com - Update dependencies - + ------------------------------------------------------------------- Wed Mar 18 09:46:06 UTC 2015 - tchvatal@suse.com diff --git a/dom4j.spec b/dom4j.spec index 78c3746..c114549 100644 --- a/dom4j.spec +++ b/dom4j.spec @@ -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 @@ -125,8 +127,10 @@ sed -i -e '/unjar/d' -e 's|,cookbook/\*\*,|,|' build.xml rm -f src/test/org/dom4j/ThreadingTest.java # FIXME: (yyang): failed in JDK6, maybe failed to load russArticle.xml because it's russian encoding rm -f src/test/org/dom4j/io/StaxTest.java +rm -rf src/java/org/dom4j/jaxb %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 +190,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) From e9bae2ae622f46859ec21f39a16e711b0f8af5ba9bf6db93920bfdd5ddfb6315 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Mon, 16 Jul 2018 08:48:10 +0000 Subject: [PATCH 4/4] OBS-URL: https://build.opensuse.org/package/show/Java:packages/dom4j?expand=0&rev=23 --- dom4j.changes | 2 -- dom4j.spec | 1 - 2 files changed, 3 deletions(-) diff --git a/dom4j.changes b/dom4j.changes index 159f36c..00905ce 100644 --- a/dom4j.changes +++ b/dom4j.changes @@ -1,8 +1,6 @@ ------------------------------------------------------------------- Tue Jul 10 12:41:17 UTC 2018 - fstrba@suse.com -- Don't build classes depending on Java EE classes removed in - OpenJDK 11 - Added patch: * dom4j-javadoc.patch + Don't load urls while building javadoc in environment without diff --git a/dom4j.spec b/dom4j.spec index c114549..6aca867 100644 --- a/dom4j.spec +++ b/dom4j.spec @@ -127,7 +127,6 @@ sed -i -e '/unjar/d' -e 's|,cookbook/\*\*,|,|' build.xml rm -f src/test/org/dom4j/ThreadingTest.java # FIXME: (yyang): failed in JDK6, maybe failed to load russArticle.xml because it's russian encoding rm -f src/test/org/dom4j/io/StaxTest.java -rm -rf src/java/org/dom4j/jaxb %patch0 -p1 -b .bug1618750 %patch1 -p1 -b .sourcetarget %patch2 -p1 -b .javadoc