From d37db6834d33fc778a0d5de27a4126a944b01f6e Mon Sep 17 00:00:00 2001 From: eabdullin Date: Thu, 4 Dec 2025 13:41:39 +0000 Subject: [PATCH] Import from AlmaLinux stable repository --- .xalan-j2.metadata | 2 +- SOURCES/generate-tarball.sh | 8 +++++++- SPECS/xalan-j2.spec | 16 +++++++++++----- 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/.xalan-j2.metadata b/.xalan-j2.metadata index 921a8c5..e7e1120 100644 --- a/.xalan-j2.metadata +++ b/.xalan-j2.metadata @@ -1 +1 @@ -678a79a205b08c900722406f030e95fb7fa7f1c8 SOURCES/xalan-j2-2.7.2.tar.gz +da110ce06a0fa8db15feb878d5f73f17e3f5b74a SOURCES/xalan-j2-2.7.2.tar.gz diff --git a/SOURCES/generate-tarball.sh b/SOURCES/generate-tarball.sh index 533a800..8b788cd 100755 --- a/SOURCES/generate-tarball.sh +++ b/SOURCES/generate-tarball.sh @@ -5,7 +5,7 @@ name=xalan-j2 version="$(sed -n 's/Version:\s*//p' *.spec)" # RETRIEVE -wget "http://apache.miloslavbrada.cz/xalan/xalan-j/source/xalan-j_${version//./_}-src.tar.gz" -O "${name}-${version}.orig.tar.gz" +wget "https://archive.apache.org/dist/xalan/xalan-j/source/xalan-j_${version//./_}-src.tar.gz" -O "${name}-${version}.orig.tar.gz" rm -rf tarball-tmp mkdir tarball-tmp @@ -15,7 +15,13 @@ tar xf "../${name}-${version}.orig.tar.gz" # CLEAN TARBALL find -name '*.jar' -delete find -name '*.class' -delete +rm -r */samples +## NOTE xml-commons-external-1.3.02-src.tar.gz in version 2.7.2 contains free +## software but proprietary content in 2.7.3, make sure to check it +# rm */src/*.tar.gz + +mv * ${name}-${version} tar czf "../${name}-${version}.tar.gz" * cd .. rm -r tarball-tmp "${name}-${version}.orig.tar.gz" diff --git a/SPECS/xalan-j2.spec b/SPECS/xalan-j2.spec index dc50621..4d971b3 100644 --- a/SPECS/xalan-j2.spec +++ b/SPECS/xalan-j2.spec @@ -1,8 +1,9 @@ +%global java_arches aarch64 ppc64le s390x x86_64 %global cvs_version %(echo %{version} | tr . _) Name: xalan-j2 Version: 2.7.2 -Release: 10%{?dist} +Release: 12%{?dist} Summary: Java XSLT processor # src/org/apache/xpath/domapi/XPathStylesheetDOM3Exception.java is W3C License: ASL 2.0 and W3C @@ -21,6 +22,7 @@ Source6: generate-tarball.sh Patch0: xalan-j2-noxsltcdeps.patch BuildArch: noarch +ExclusiveArch: %{java_arches} noarch BuildRequires: javapackages-local BuildRequires: ant @@ -63,12 +65,9 @@ License: ASL 2.0 Documentation for %{name}. %prep -%setup -q -n xalan-j_%{cvs_version} +%setup -q %patch0 -p0 -find . -name '*.jar' -delete -find . -name '*.class' -delete - sed -i '/ - 2.7.2-12 +- Rebuild to regenerate auto-requires + +* Wed Jun 12 2024 Marián Konček - 2.7.2-11 +- Remove proprietary data from source RPM +- Resolves: RHEL-40891 + * Tue Aug 10 2021 Mohan Boddu - 2.7.2-10 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags Related: rhbz#1991688