From 4ec0bb0075d4558f9334f26b40d0eccb3cc574597de756b4edb5065cc5979b2a Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Sun, 10 Sep 2017 06:51:03 +0000 Subject: [PATCH 1/3] OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/pentaho-libxml?expand=0&rev=6 --- pentaho-libxml-1.1.3-doclint.patch | 10 ++++++++++ pentaho-libxml-1.1.3-sourcetarget.patch | 13 +++++++++++++ pentaho-libxml.changes | 10 ++++++++++ pentaho-libxml.spec | 6 +++++- 4 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 pentaho-libxml-1.1.3-doclint.patch create mode 100644 pentaho-libxml-1.1.3-sourcetarget.patch diff --git a/pentaho-libxml-1.1.3-doclint.patch b/pentaho-libxml-1.1.3-doclint.patch new file mode 100644 index 0000000..0c3a618 --- /dev/null +++ b/pentaho-libxml-1.1.3-doclint.patch @@ -0,0 +1,10 @@ +--- 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-1.1.3-sourcetarget.patch b/pentaho-libxml-1.1.3-sourcetarget.patch new file mode 100644 index 0000000..c2f4669 --- /dev/null +++ b/pentaho-libxml-1.1.3-sourcetarget.patch @@ -0,0 +1,13 @@ +--- 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:46:25.295087266 +0200 +@@ -136,8 +136,8 @@ + +- +- ++ ++ + + + Date: Mon, 11 Sep 2017 14:41:52 +0000 Subject: [PATCH 2/3] 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 From 250e9b1ce44c822031f62ea8d55ffc476b9c95717eeee92e063ae15905ec2857 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Mon, 11 Sep 2017 17:11:57 +0000 Subject: [PATCH 3/3] Accepting request 523301 from home:jengelh:branches:LibreOffice:Factory - Edit description for neutrality. Replace find -exec rm by just -delete. OBS-URL: https://build.opensuse.org/request/show/523301 OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/pentaho-libxml?expand=0&rev=8 --- pentaho-libxml.changes | 6 ++++++ pentaho-libxml.spec | 8 ++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/pentaho-libxml.changes b/pentaho-libxml.changes index c6aaaaa..3eb0bfc 100644 --- a/pentaho-libxml.changes +++ b/pentaho-libxml.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Sep 11 16:10:57 UTC 2017 - jengelh@inai.de + +- Edit description for neutrality. + Replace find -exec rm by just -delete. + ------------------------------------------------------------------- Sun Sep 10 06:49:53 UTC 2017 - fstrba@suse.com diff --git a/pentaho-libxml.spec b/pentaho-libxml.spec index 5b731ba..a117369 100644 --- a/pentaho-libxml.spec +++ b/pentaho-libxml.spec @@ -20,7 +20,7 @@ Name: pentaho-libxml Version: 1.1.3 Release: 0 -Summary: Namespace aware SAX-Parser utility library +Summary: Namespace aware SAX parser utility library License: LGPL-2.0 Group: Development/Libraries/Java Url: http://reporting.pentaho.org/ @@ -46,8 +46,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch %description -Pentaho LibXML is a namespace aware SAX-Parser utility library. It eases the -pain of implementing non-trivial SAX input handlers. +Pentaho LibXML is a namespace aware SAX parser utility library. It +facilitates implementing non-trivial SAX input handlers. %package javadoc Summary: Javadoc for %{name} @@ -60,7 +60,7 @@ Javadoc for %{name}. %setup -q -c %patch0 -p1 -b .build %patch1 -p1 -find . -name "*.jar" -exec rm -f {} \; +find . -name "*.jar" -delete mkdir -p lib build-jar-repository -s -p lib commons-logging-api libbase libloader cd lib