From 62259b90a4c0fadc19d5e867856e951f68e46002 Mon Sep 17 00:00:00 2001 From: eabdullin Date: Tue, 11 Mar 2025 08:21:00 +0000 Subject: [PATCH] import CS xerces-j2-2.12.1-11.el9 --- SPECS/xerces-j2.spec | 37 ++++++++++++++++++++++++++----------- 1 file changed, 26 insertions(+), 11 deletions(-) diff --git a/SPECS/xerces-j2.spec b/SPECS/xerces-j2.spec index 69bf6d0..6f2df61 100644 --- a/SPECS/xerces-j2.spec +++ b/SPECS/xerces-j2.spec @@ -2,7 +2,7 @@ Name: xerces-j2 Version: 2.12.1 -Release: 6%{?dist} +Release: 11%{?dist} Summary: Java XML parser # Most of the source is ASL 2.0 # W3C licensed files: @@ -10,6 +10,8 @@ Summary: Java XML parser # src/org/w3c/dom/html/HTMLDOMImplementation.java License: ASL 2.0 and W3C URL: http://xerces.apache.org/xerces2-j/ +BuildArch: noarch +ExclusiveArch: aarch64 ppc64le s390x x86_64 noarch %global cvs_version %(tr . _ <<< %{version}) @@ -31,14 +33,11 @@ Patch1: %{name}-manifest.patch # Patch build.xml to patch modules as needed during javadoc generation Patch2: %{name}-modulefix.patch -BuildArch: noarch - BuildRequires: javapackages-local BuildRequires: ant BuildRequires: apache-parent BuildRequires: xml-commons-apis >= 1.4.01 BuildRequires: xml-commons-resolver >= 1.2 -BuildRequires: java-devel Requires: xml-commons-apis >= 1.4.01 Requires: xml-commons-resolver >= 1.2 @@ -105,9 +104,9 @@ Requires: %{name} = %{version}-%{release} %prep %setup -n xerces-%{cvs_version} -%patch0 -p0 -%patch1 -p0 -%patch2 -p0 +%patch -P 0 -p0 +%patch -P 1 -p0 +%patch -P 2 -p0 # Copy the custom ant task into place mkdir -p tools/org/apache/xerces/util @@ -130,10 +129,10 @@ sed -i -e "s|additionalparam='|additionalparam='-Xdoclint:none |" build.xml pushd tools # Build custom ant tasks -javac -classpath $(build-classpath ant) org/apache/xerces/util/XJavac.java -jar cf bin/xjavac.jar org/apache/xerces/util/XJavac.class +%{_jvmdir}/java-11-openjdk/bin/javac -classpath $(build-classpath ant) org/apache/xerces/util/XJavac.java +%{_jvmdir}/java-11-openjdk/bin/jar cf bin/xjavac.jar org/apache/xerces/util/XJavac.class -jar cmf /dev/null serializer.jar +%{_jvmdir}/java-11-openjdk/bin/jar cmf /dev/null serializer.jar ln -sf $(build-classpath xml-commons-apis) xml-apis.jar ln -sf $(build-classpath xml-commons-resolver) resolver.jar popd @@ -171,7 +170,8 @@ install -p -m 644 %{SOURCE11} %{buildroot}%{_mandir}/man1 install -p -m 644 %{SOURCE12} %{buildroot}%{_mandir}/man1 # demo -install -pD -T build/xercesSamples.jar %{buildroot}%{_datadir}/%{name}/%{name}-samples.jar +install -d -m 755 %{buildroot}%{_datadir}/%{name}/ +install -p -m 644 build/xercesSamples.jar %{buildroot}%{_datadir}/%{name}/%{name}-samples.jar cp -pr data %{buildroot}%{_datadir}/%{name} %post @@ -192,6 +192,21 @@ ln -sf %{name}.jar %{_javadir}/jaxp_parser_impl.jar %{_datadir}/%{name} %changelog +* Wed Dec 04 2024 Mikolaj Izdebski - 2.12.1-11 +- Fix incorrect permissions of xerces-j2-samples.jar + +* Sat Nov 23 2024 Marián Konček - 2.12.1-10 +- Add noarch to ExclusiveArch + +* Fri Nov 22 2024 Marián Konček - 2.12.1-9 +- Disable building on i686 + +* Thu Nov 21 2024 Marián Konček - 2.12.1-8 +- Fix patch usage + +* Tue Nov 19 2024 Marián Konček - 2.12.1-7 +- Rebuild with regenerated Requires on Java + * Tue Aug 10 2021 Mohan Boddu - 2.12.1-6 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags Related: rhbz#1991688