From 5b6a833f7ddc1ab44ab7ff25b1758cc13795d58f Mon Sep 17 00:00:00 2001 From: tigro Date: Mon, 23 Dec 2024 19:34:24 +0300 Subject: [PATCH] import pentaho-libxml-1.1.3-43.el10 --- .pentaho-libxml.metadata | 2 +- SOURCES/libxml-1.1.2-java11.patch | 4 +- SPECS/pentaho-libxml.spec | 68 +++++++++++++++++++++++++------ 3 files changed, 58 insertions(+), 16 deletions(-) diff --git a/.pentaho-libxml.metadata b/.pentaho-libxml.metadata index 746aaf3..557fb9c 100644 --- a/.pentaho-libxml.metadata +++ b/.pentaho-libxml.metadata @@ -1 +1 @@ -77be9754b3add514d19472ca72e869233ba79284 SOURCES/libxml-1.1.3-jarsdeleted.zip +77be9754b3add514d19472ca72e869233ba79284 SOURCES/libxml-1.1.3-jarsdeleted.zip diff --git a/SOURCES/libxml-1.1.2-java11.patch b/SOURCES/libxml-1.1.2-java11.patch index 94cd06d..e458923 100644 --- a/SOURCES/libxml-1.1.2-java11.patch +++ b/SOURCES/libxml-1.1.2-java11.patch @@ -6,8 +6,8 @@ description="Indicates whether source should be compiled with deprecation information" /> - - -+ -+ ++ ++ = 1.1.2, libloader >= 1.1.2 BuildArch: noarch +ExclusiveArch: %{java_arches} noarch Patch0: libxml-1.1.2-build.patch Patch1: libxml-1.1.2-java11.patch Patch2: libxml-1.1.3-remove-commons-logging.patch @@ -32,10 +33,10 @@ Javadoc for %{name}. %prep %setup -q -c -%patch0 -p1 -b .build -%patch1 -p1 -b .java11 -%patch2 -p1 -b .no_commons_logging -%patch3 -p1 -b .remove-antcontrib-support +%patch -P0 -p1 -b .build +%patch -P1 -p1 -b .java11 +%patch -P2 -p1 -b .no_commons_logging +%patch -P3 -p1 -b .remove-antcontrib-support find . -name "*.jar" -exec rm -f {} \; mkdir -p lib build-jar-repository -s -p lib libbase libloader @@ -63,16 +64,57 @@ cp -rp bin/javadoc/docs/api $RPM_BUILD_ROOT%{_javadocdir}/%{origname} %{_javadocdir}/%{origname} %changelog -* Mon Aug 09 2021 Mohan Boddu - 1.1.3-30 -- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags - Related: rhbz#1991688 +* Mon Dec 23 2024 Arkady L. Shane - 1.1.3-43 +- Rebuilt for MSVSphere 10 + +* Thu Jul 18 2024 Fedora Release Engineering - 1.1.3-43 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Tue Feb 27 2024 Jiri Vanek - 1.1.3-42 +- Rebuilt for java-21-openjdk as system jdk + +* Thu Jan 25 2024 Fedora Release Engineering - 1.1.3-41 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Jan 21 2024 Fedora Release Engineering - 1.1.3-40 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Thu Jul 20 2023 Fedora Release Engineering - 1.1.3-39 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Tue Jul 11 2023 Gwyn Ciesla - 1.1.3-38 +- Bump EVR + +* Fri Feb 24 2023 Caolán McNamara - 1.1.3-37 +- migrated to SPDX license + +* Thu Jan 19 2023 Fedora Release Engineering - 1.1.3-36 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Fri Jul 22 2022 Fedora Release Engineering - 1.1.3-35 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Fri Jul 08 2022 Jiri Vanek - 1.1.3-34 +- Rebuilt for Drop i686 JDKs + +* Sat Feb 05 2022 Jiri Vanek - 1.1.3-33 +- Rebuilt for java-17-openjdk as system jdk + +* Thu Jan 20 2022 Fedora Release Engineering - 1.1.3-32 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Thu Dec 02 2021 Caolán McNamara - 1.1.3-31 +- prep for f36 mass rebuild for java-17-openjdk + +* Thu Jul 22 2021 Fedora Release Engineering - 1.1.3-30 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild * Mon Jun 28 2021 Mikolaj Izdebski - 1.1.3-29 -- Resolves: rhbz#1976942 remove build dependency on ant-contrib +- Remove build dependency on ant-contrib +- Resolves: rhbz#1976942 -* 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 +* Wed Apr 07 2021 Caolán McNamara - 1.1.3-28 +- Related: rhbz#1895921 replace apache-commons-logging with java.util.logging * Tue Jan 26 2021 Fedora Release Engineering - 1.1.3-27 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild