diff --git a/libxml-1.1.3-remove-antcontrib-support.patch b/libxml-1.1.3-remove-antcontrib-support.patch new file mode 100644 index 0000000..dd5d10a --- /dev/null +++ b/libxml-1.1.3-remove-antcontrib-support.patch @@ -0,0 +1,229 @@ +diff -ru pentaho-libxml-1.1.3.orig/common_build.xml pentaho-libxml-1.1.3/common_build.xml +--- pentaho-libxml-1.1.3.orig/common_build.xml 2021-06-28 17:28:26.396270761 +0100 ++++ pentaho-libxml-1.1.3/common_build.xml 2021-06-28 17:32:01.697273657 +0100 +@@ -152,9 +152,6 @@ + +- + +@@ -326,68 +323,6 @@ + + + +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- + ++ depends="svnant.download-check"> + + + +@@ -492,57 +427,12 @@ + + + +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- + ++ depends="ivy.download-check"> + + + +@@ -602,7 +492,7 @@ + Verifies that there are no SNAPSHOT dependencies defined in the ivy xml. + If there are SNAPSHOTS, fail the release build. + ====================================================================--> +- ++ + + + +@@ -769,7 +659,7 @@ + Publishes the jar file for this project to a Maven2 repository. + ====================================================================--> + ++ depends="create-pom,ivy.deliver"> + + + +@@ -1078,30 +968,12 @@ + +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- ++ ++ ++ ++ + + + +@@ -1151,7 +1023,7 @@ + + Creates a jar file from the bin directory + ====================================================================--> +- ++ + + + +@@ -1164,7 +1036,7 @@ + Creates a new manifest file if one is not specified, or updates + an existing manifest file if one is specified. + ====================================================================--> +- ++ + + + +@@ -1648,4 +1520,4 @@ + + + +- +\ No newline at end of file ++ diff --git a/pentaho-libxml.spec b/pentaho-libxml.spec index 63166c5..e3c20ab 100644 --- a/pentaho-libxml.spec +++ b/pentaho-libxml.spec @@ -2,7 +2,7 @@ Name: pentaho-libxml Version: 1.1.3 -Release: 28%{?dist} +Release: 29%{?dist} Summary: Namespace aware SAX-Parser utility library License: LGPLv2 #Original source: http://downloads.sourceforge.net/jfreereport/%%{origname}-%%{version}.zip @@ -10,12 +10,13 @@ License: LGPLv2 #to simplify the licensing Source: %{origname}-%{version}-jarsdeleted.zip URL: http://reporting.pentaho.org/ -BuildRequires: ant, ant-contrib, java-devel, jpackage-utils, libbase, libloader +BuildRequires: ant, java-devel, jpackage-utils, libbase, libloader Requires: java-headless, jpackage-utils, libbase >= 1.1.2, libloader >= 1.1.2 BuildArch: noarch Patch0: libxml-1.1.2-build.patch Patch1: libxml-1.1.2-java11.patch Patch2: libxml-1.1.3-remove-commons-logging.patch +Patch3: libxml-1.1.3-remove-antcontrib-support.patch %description Pentaho LibXML is a namespace aware SAX-Parser utility library. It eases the @@ -34,11 +35,11 @@ Javadoc for %{name}. %patch0 -p1 -b .build %patch1 -p1 -b .java11 %patch2 -p1 -b .no_commons_logging +%patch3 -p1 -b .remove-antcontrib-support find . -name "*.jar" -exec rm -f {} \; mkdir -p lib build-jar-repository -s -p lib libbase libloader cd lib -ln -s /usr/share/java/ant ant-contrib %build ant jar javadoc @@ -62,6 +63,9 @@ cp -rp bin/javadoc/docs/api $RPM_BUILD_ROOT%{_javadocdir}/%{origname} %{_javadocdir}/%{origname} %changelog +* Mon Jun 28 2021 Mikolaj Izdebski - 1.1.3-29 +- Resolves: rhbz#1976942 remove build dependency on ant-contrib + * Fri Apr 16 2021 Mohan Boddu - 1.1.3-28 - Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937 - Related: rhbz#1951271 replace apache-commons-logging with java.util.logging