From 5b4bb48a52afa5638a7c2338e139e2422a7f2abdf4ddd4ec5771e278ef0967c2 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 21 Apr 2022 11:46:19 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/pentaho-libxml?expand=0&rev=13 --- libxml-1.1.2-build.patch | 17 ----------------- libxml-1.1.3-jarsdeleted.zip | 3 --- libxml-1.1.6.zip | 3 +++ pentaho-libxml-1.1.6-build.patch | 18 ++++++++++++++++++ ... => pentaho-libxml-1.1.6-sourcetarget.patch | 8 +++++--- pentaho-libxml.changes | 8 ++++++++ pentaho-libxml.spec | 15 ++++++--------- 7 files changed, 40 insertions(+), 32 deletions(-) delete mode 100644 libxml-1.1.2-build.patch delete mode 100644 libxml-1.1.3-jarsdeleted.zip create mode 100644 libxml-1.1.6.zip create mode 100644 pentaho-libxml-1.1.6-build.patch rename pentaho-libxml-1.1.3-sourcetarget.patch => pentaho-libxml-1.1.6-sourcetarget.patch (73%) diff --git a/libxml-1.1.2-build.patch b/libxml-1.1.2-build.patch deleted file mode 100644 index caa0445..0000000 --- a/libxml-1.1.2-build.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- pentaho-libxml-1.1.3/build.properties 2009-11-17 15:20:48.000000000 +0000 -+++ pentaho-libxml-1.1.3/build.properties 2009-11-17 15:20:57.000000000 +0000 -@@ -1,4 +1,4 @@ --project.revision=TRUNK-SNAPSHOT -+project.revision=1.1.3 - ivy.artifact.group=pentaho-library - ivy.artifact.id=libxml - impl.title=LibXml -@@ -6,4 +6,6 @@ - src.dir=${basedir}/source - dependency.libbase.revision=1.1.3 - dependency.libloader.revision=1.1.3 --testsrc.dir=${basedir}/test -\ No newline at end of file -+testsrc.dir=${basedir}/test -+antcontrib.available=true -+build.cache.dir=lib diff --git a/libxml-1.1.3-jarsdeleted.zip b/libxml-1.1.3-jarsdeleted.zip deleted file mode 100644 index 88e4032..0000000 --- a/libxml-1.1.3-jarsdeleted.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:93c7e4f052aa7f279c92dbda182ea5467d101915847a93a917653283bd961962 -size 119951 diff --git a/libxml-1.1.6.zip b/libxml-1.1.6.zip new file mode 100644 index 0000000..fa7c045 --- /dev/null +++ b/libxml-1.1.6.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:137c5e890ca1204d9511796366590a16325c611275bf0a622542c0043afd8b0c +size 2931841 diff --git a/pentaho-libxml-1.1.6-build.patch b/pentaho-libxml-1.1.6-build.patch new file mode 100644 index 0000000..b63b1d6 --- /dev/null +++ b/pentaho-libxml-1.1.6-build.patch @@ -0,0 +1,18 @@ +Index: pentaho-libxml-1.1.6/build.properties +=================================================================== +--- pentaho-libxml-1.1.6.orig/build.properties ++++ pentaho-libxml-1.1.6/build.properties +@@ -1,4 +1,4 @@ +-project.revision=1.1-SNAPSHOT ++project.revision=1.1.6 + ivy.artifact.group=pentaho-library + ivy.artifact.id=libxml + impl.title=LibXml +@@ -6,4 +6,6 @@ impl.productID=libxml + src.dir=${basedir}/source + dependency.libbase.revision=1.1.6 + dependency.libloader.revision=1.1.6 +-testsrc.dir=${basedir}/test ++ ++antcontrib.available=true ++build.cache.dir=lib diff --git a/pentaho-libxml-1.1.3-sourcetarget.patch b/pentaho-libxml-1.1.6-sourcetarget.patch similarity index 73% rename from pentaho-libxml-1.1.3-sourcetarget.patch rename to pentaho-libxml-1.1.6-sourcetarget.patch index d242599..7cf681d 100644 --- a/pentaho-libxml-1.1.3-sourcetarget.patch +++ b/pentaho-libxml-1.1.6-sourcetarget.patch @@ -1,6 +1,8 @@ ---- 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 @@ +Index: pentaho-libxml-1.1.6/common_build.xml +=================================================================== +--- pentaho-libxml-1.1.6.orig/common_build.xml ++++ pentaho-libxml-1.1.6/common_build.xml +@@ -136,8 +136,8 @@ TYPICAL TARGET SEQUENCE diff --git a/pentaho-libxml.changes b/pentaho-libxml.changes index eaba105..d0b07cb 100644 --- a/pentaho-libxml.changes +++ b/pentaho-libxml.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Apr 21 10:27:41 UTC 2022 - David Anes + +- Update to upstream version 1.1.6. +- Rebased and updated patches: + * libxml-1.1.2.build.patch -> pentaho-libxml-1.1.6.build.patch + * pentaho-libxml-1.1.3-sourcetarget.patch -> pentaho-libxml-1.1.6-sourcetarget.patch + ------------------------------------------------------------------- Sun Mar 20 08:57:04 UTC 2022 - Fridrich Strba diff --git a/pentaho-libxml.spec b/pentaho-libxml.spec index 0b4fbda..453b6a5 100644 --- a/pentaho-libxml.spec +++ b/pentaho-libxml.spec @@ -18,19 +18,16 @@ %define origname libxml Name: pentaho-libxml -Version: 1.1.3 +Version: 1.1.6 Release: 0 Summary: Namespace aware SAX parser utility library License: LGPL-2.0-only Group: Development/Libraries/Java URL: http://reporting.pentaho.org/ -#Original source: http://downloads.sourceforge.net/jfreereport/%%{origname}-%%{version}.zip -#unzip, find . -name "*.jar" -exec rm {} \; -#to simplify the licensing -Source: %{origname}-%{version}-jarsdeleted.zip +Source: http://downloads.sourceforge.net/jfreereport/%{origname}-%{version}.zip #PATCH-FIX-UPSTREAM, fix some properties for build -Patch0: libxml-1.1.2-build.patch -Patch1: pentaho-libxml-1.1.3-sourcetarget.patch +Patch0: pentaho-libxml-1.1.6-build.patch +Patch1: pentaho-libxml-1.1.6-sourcetarget.patch BuildRequires: ant BuildRequires: ant-contrib BuildRequires: java-devel >= 1.8 @@ -40,8 +37,8 @@ BuildRequires: libloader BuildRequires: unzip Requires: java Requires: jpackage-utils -Requires: libbase >= 1.1.2 -Requires: libloader >= 1.1.2 +Requires: libbase >= 1.1.6 +Requires: libloader >= 1.1.6 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch