From 2338ea61c7dbb1a6dd1575cf3e02c9281c2f87a245c5ff5680a4c82e26242212 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Mon, 11 Sep 2017 14:41:52 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/pentaho-libxml?expand=0&rev=7 --- pentaho-libxml-1.1.3-doclint.patch | 10 ---------- pentaho-libxml.changes | 4 +--- pentaho-libxml.spec | 2 -- 3 files changed, 1 insertion(+), 15 deletions(-) delete mode 100644 pentaho-libxml-1.1.3-doclint.patch diff --git a/pentaho-libxml-1.1.3-doclint.patch b/pentaho-libxml-1.1.3-doclint.patch deleted file mode 100644 index 0c3a618..0000000 --- a/pentaho-libxml-1.1.3-doclint.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- pentaho-libxml-1.1.3/common_build.xml 2017-09-10 08:45:02.793392955 +0200 -+++ pentaho-libxml-1.1.3/common_build.xml 2017-09-10 08:47:20.864235634 +0200 -@@ -1352,6 +1352,7 @@ - nodeprecatedlist="false" - nodeprecated="false" - packagenames="${javadoc.packagenames}" -+ additionalparam="-Xdoclint:none" - sourcepath="${src.dir}" - doctitle="${impl.title} documentation"> - diff --git a/pentaho-libxml.changes b/pentaho-libxml.changes index 83ba84f..c6aaaaa 100644 --- a/pentaho-libxml.changes +++ b/pentaho-libxml.changes @@ -1,9 +1,7 @@ ------------------------------------------------------------------- Sun Sep 10 06:49:53 UTC 2017 - fstrba@suse.com -- Added patches: - * pentaho-libxml-1.1.3-doclint.patch - + Don't bail out on doclint errors +- Added patch: * pentaho-libxml-1.1.3-sourcetarget.patch + Specify java source and target 1.6 in order to allow building with jdk9 diff --git a/pentaho-libxml.spec b/pentaho-libxml.spec index aaebd9f..5b731ba 100644 --- a/pentaho-libxml.spec +++ b/pentaho-libxml.spec @@ -31,7 +31,6 @@ Source: %{origname}-%{version}-jarsdeleted.zip #PATCH-FIX-UPSTREAM, fix some properties for build Patch0: libxml-1.1.2-build.patch Patch1: pentaho-libxml-1.1.3-sourcetarget.patch -Patch2: pentaho-libxml-1.1.3-doclint.patch BuildRequires: ant BuildRequires: ant-contrib BuildRequires: java-devel @@ -61,7 +60,6 @@ Javadoc for %{name}. %setup -q -c %patch0 -p1 -b .build %patch1 -p1 -%patch2 -p1 find . -name "*.jar" -exec rm -f {} \; mkdir -p lib build-jar-repository -s -p lib commons-logging-api libbase libloader