diff --git a/.gitignore b/.gitignore index 066bf79..2275278 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,6 @@ /xalan-2.7.2.pom /serializer-2.7.2.pom /xsltc-2.7.2.pom +/xalan-j2-2.7.3.tar.gz +/xalan-2.7.3.pom +/serializer-2.7.3.pom diff --git a/generate-tarball.sh b/generate-tarball.sh index 533a800..5288e40 100755 --- a/generate-tarball.sh +++ b/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 @@ -16,6 +16,7 @@ tar xf "../${name}-${version}.orig.tar.gz" find -name '*.jar' -delete find -name '*.class' -delete +mv * ${name}-${version} tar czf "../${name}-${version}.tar.gz" * cd .. rm -r tarball-tmp "${name}-${version}.orig.tar.gz" diff --git a/sources b/sources index 9e100e3..ca17e66 100644 --- a/sources +++ b/sources @@ -1,4 +1,3 @@ -SHA512 (xalan-j2-2.7.2.tar.gz) = d30cc8179eb98704f8bbab80b6462565b177bc9cee99be042f0cad0d34924446574ae849f735fcc0cbbbcd81963c1b1bc0f76d8f981109ae168b21cb057c0eef -SHA512 (xalan-2.7.2.pom) = 4b95e3eb3a2ab262c9a27040a5214cfb8c49c36ece8e71a933074eb063205ef96deff351f017b034c9c97d43d77b020482aade7bc01e1245d8ee10a51269c5ce -SHA512 (serializer-2.7.2.pom) = 1a20cd7008ab876f9605a67515d558b26b9be009c4f49cb27ddf5aa715b5d164c476c236b6d6edf39e81538dfb1516271c3859af8e73f8cdbeee24efb45e9a44 -SHA512 (xsltc-2.7.2.pom) = 89c5c2cd358c32a9b8073869abdcb1df21a95c21a1a099c1b91f25ac3de7fdf9893977cb227efa4dad1de29773aaaef155155d1ec8648aae3c2e512154c200ef +SHA512 (xalan-j2-2.7.3.tar.gz) = 846f8da060888977ade2816db0c30616ae66013ce9abbe3e17318b792a6fa31d83856f798a0b8dddc506cf6ffd0e73389b850e124db77acd42aadb37e9d0bfdd +SHA512 (xalan-2.7.3.pom) = 65f1bb02ad4d0ddc1da20a54e6937353e39a9f70f9860b74ffef6061f7c55980f31258ba7e4b2664a6546208e4d41a4bd2c8beed3739248d89424d4bce561434 +SHA512 (serializer-2.7.3.pom) = ab19e0d5de56a0b6db4515f3169bef9aadd8c6522296da4bb64eb2b271b4293aa4b37bc2c34fd1df50c53fb431c469eaa3df7144f53f4b6eb9faf9f9bd9a43e1 diff --git a/xalan-j2.spec b/xalan-j2.spec index 7317bf9..259f607 100644 --- a/xalan-j2.spec +++ b/xalan-j2.spec @@ -1,8 +1,6 @@ -%global cvs_version %(echo %{version} | tr . _) - Name: xalan-j2 -Version: 2.7.2 -Release: 17%{?dist} +Version: 2.7.3 +Release: 1%{?dist} Summary: Java XSLT processor # src/org/apache/xpath/domapi/XPathStylesheetDOM3Exception.java is W3C License: Apache-2.0 AND W3C @@ -11,8 +9,8 @@ URL: http://xalan.apache.org/ # ./generate-tarball.sh Source0: %{name}-%{version}.tar.gz Source1: xalan-j2-serializer-MANIFEST.MF -Source2: http://repo1.maven.org/maven2/xalan/xalan/%{version}/xalan-%{version}.pom -Source3: http://repo1.maven.org/maven2/xalan/serializer/%{version}/serializer-%{version}.pom +Source2: https://repo1.maven.org/maven2/xalan/xalan/%{version}/xalan-%{version}.pom +Source3: https://repo1.maven.org/maven2/xalan/serializer/%{version}/serializer-%{version}.pom Source4: xsltc-%{version}.pom Source5: xalan-j2-MANIFEST.MF # Remove bundled binaries which cannot be easily verified for licensing @@ -64,7 +62,7 @@ License: Apache-2.0 Documentation for %{name}. %prep -%setup -q -n xalan-j_%{cvs_version} +%setup -q %patch0 -p0 find . -name '*.jar' -delete @@ -86,25 +84,18 @@ sed -i 's/\r//' KEYS LICENSE.txt NOTICE.txt xdocs/style/resources/script.js \ %mvn_package :xsltc xsltc %build -pushd lib -ln -sf $(build-classpath java_cup-runtime) runtime.jar -ln -sf $(build-classpath bcel) BCEL.jar -ln -sf $(build-classpath regexp) regexp.jar -ln -sf $(build-classpath xerces-j2) xercesImpl.jar -ln -sf $(build-classpath xml-commons-apis) xml-apis.jar -popd -pushd tools -ln -sf $(build-classpath java_cup) java_cup.jar -ln -sf $(build-classpath ant) ant.jar -popd -export CLASSPATH=$(build-classpath glassfish-servlet-api) - -ant \ - -Dcompiler.source=1.7 \ - -Dcompiler.target=1.7 \ +%ant \ + -Dcompiler.source=1.8 \ + -Dcompiler.target=1.8 \ -Djava.awt.headless=true \ -Dbuild.xalan-interpretive.jar=build/xalan-interpretive.jar \ - xalan-interpretive.jar\ + -Dxmlapis.jar=$(build-classpath xml-commons-apis) \ + -Dparser.jar=$(build-classpath xerces-j2) \ + -Dbcel.jar=$(build-classpath bcel) \ + -Druntime.jar=$(build-classpath java_cup-runtime) \ + -Dregexp.jar=$(build-classpath regexp) \ + -Djava_cup.jar=$(build-classpath java_cup) \ + xalan-interpretive.jar \ xsltc.unbundledjar \ docs @@ -119,17 +110,9 @@ jar ufm build/xalan-interpretive.jar %{SOURCE5} %install %mvn_install -%post -# update-alternatives will remove the symlink - preserve it -mv %{_javadir}/jaxp_transform_impl.jar{,.tmp} || : -# alternatives removed in f26 -update-alternatives --remove jaxp_transform_impl %{_javadir}/%{name}.jar &>/dev/null || : -# restore the symlink -mv %{_javadir}/jaxp_transform_impl.jar{.tmp,} || : - %files -f .mfiles %license LICENSE.txt NOTICE.txt -%doc KEYS readme.html +%doc KEYS README %files xsltc -f .mfiles-xsltc %license LICENSE.txt NOTICE.txt @@ -139,6 +122,10 @@ mv %{_javadir}/jaxp_transform_impl.jar{.tmp,} || : %doc build/docs/* %changelog +* Fri Feb 02 2024 Mikolaj Izdebski - 2.7.3-1 +- Update to upstream version 2.7.3 +- Remove alternatives post striplet + * Sat Jan 27 2024 Fedora Release Engineering - 2.7.2-17 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild diff --git a/xsltc-2.7.3.pom b/xsltc-2.7.3.pom new file mode 100644 index 0000000..944df42 --- /dev/null +++ b/xsltc-2.7.3.pom @@ -0,0 +1,13 @@ + + 4.0.0 + xalan + xsltc + 2.7.3 + + + xalan + xalan + 2.7.3 + + +