Clean tarball from proprietary content

Resolves: RHEL-40891

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"

sources

@@ -1,4 +1,4 @@
-SHA512 (xalan-j2-2.7.2.tar.gz) = d30cc8179eb98704f8bbab80b6462565b177bc9cee99be042f0cad0d34924446574ae849f735fcc0cbbbcd81963c1b1bc0f76d8f981109ae168b21cb057c0eef
+SHA512 (xalan-j2-2.7.2.tar.gz) = 90a2bbb39c4d1ea15fb100f2eb12b47eb958ef4c8fba791fd980133bf679a41a582a4c4f6c493e0b0f41d6e8c76ee4d8aa1841d4f56e498f19f6edb64fc1f268
 SHA512 (xalan-2.7.2.pom) = 4b95e3eb3a2ab262c9a27040a5214cfb8c49c36ece8e71a933074eb063205ef96deff351f017b034c9c97d43d77b020482aade7bc01e1245d8ee10a51269c5ce
 SHA512 (serializer-2.7.2.pom) = 1a20cd7008ab876f9605a67515d558b26b9be009c4f49cb27ddf5aa715b5d164c476c236b6d6edf39e81538dfb1516271c3859af8e73f8cdbeee24efb45e9a44
 SHA512 (xsltc-2.7.2.pom) = 89c5c2cd358c32a9b8073869abdcb1df21a95c21a1a099c1b91f25ac3de7fdf9893977cb227efa4dad1de29773aaaef155155d1ec8648aae3c2e512154c200ef

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