Accepting request 1103181 from LibreOffice:Factory

1.1.6

OBS-URL: https://build.opensuse.org/request/show/1103181
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/pentaho-libxml?expand=0&rev=6

libxml-1.1.2-build.patch

@@ -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

libxml-1.1.3-jarsdeleted.zip

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:93c7e4f052aa7f279c92dbda182ea5467d101915847a93a917653283bd961962
-size 119951

libxml-1.1.6.zip

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:137c5e890ca1204d9511796366590a16325c611275bf0a622542c0043afd8b0c
+size 2931841

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

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
    <property name="javac.deprecation"
              value="true"
              description="Indicates whether source should be compiled with deprecation information" />

pentaho-libxml.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Thu Apr 21 10:27:41 UTC 2022 - David Anes <david.anes@suse.com>
+
+- Update to upstream version 1.1.6.
+  * no structured changelog available starting from 2008
+- 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 <fstrba@suse.com>
 

pentaho-libxml.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package pentaho-libxml
 #
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -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