import CS xalan-j2-2.7.2-11.el9

.xalan-j2.metadata

@@ -1 +1 @@
-678a79a205b08c900722406f030e95fb7fa7f1c8 SOURCES/xalan-j2-2.7.2.tar.gz
+da110ce06a0fa8db15feb878d5f73f17e3f5b74a SOURCES/xalan-j2-2.7.2.tar.gz

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"

SPECS/xalan-j2.spec

@@ -2,7 +2,7 @@
 
 Name:           xalan-j2
 Version:        2.7.2
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        Java XSLT processor
 # src/org/apache/xpath/domapi/XPathStylesheetDOM3Exception.java is W3C
 License:        ASL 2.0 and W3C
@@ -63,12 +63,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 '/<bootclasspath/d' build.xml
 (cd ./src && tar xf xml-commons-external-*-src.tar.gz)
 
@@ -138,6 +135,10 @@ mv %{_javadir}/jaxp_transform_impl.jar{.tmp,} || :
 %doc build/docs/*
 
 %changelog
+* Wed Jun 12 2024 Marián Konček <mkoncek@redhat.com> - 2.7.2-11
+- Remove proprietary data from source RPM
+- Resolves: RHEL-40891
+
 * Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 2.7.2-10
 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
   Related: rhbz#1991688