From f26c75efa031c2accc52e55f4fc484ebd4405bb3 Mon Sep 17 00:00:00 2001 From: fun_yang Date: Mon, 9 Mar 2020 15:04:25 +0800 Subject: [PATCH] Source address change --- generate-tarball.sh => generate-tar.sh | 6 +++--- xalan-j2.spec | 15 +++++++++------ 2 files changed, 12 insertions(+), 9 deletions(-) rename generate-tarball.sh => generate-tar.sh (69%) diff --git a/generate-tarball.sh b/generate-tar.sh similarity index 69% rename from generate-tarball.sh rename to generate-tar.sh index bee814c..8840e2a 100644 --- a/generate-tarball.sh +++ b/generate-tar.sh @@ -5,12 +5,12 @@ name=xalan-j2 version="$(sed -n 's/Version:\s*//p' *.spec)" # RETRIEVE -wget "http://archive.apache.org/dist/xml/xalan-j/xalan-j_${version//./_}-src.tar.gz" -O "${name}-${version}.orig.tar.gz" +wget "http://archive.apache.org/dist/xml/xalan-j/xalan-j_${version//./_}-src.tar.gz" rm -rf tarball-tmp mkdir tarball-tmp cd tarball-tmp -tar xf "../${name}-${version}.orig.tar.gz" +tar xzf "../xalan-j_${version//./_}-src.tar.gz" # CLEAN TARBALL find -name '*.jar' -delete @@ -19,4 +19,4 @@ rm */src/*.tar.gz tar cf "../${name}-${version}.tar.gz" * cd .. -rm -r tarball-tmp "${name}-${version}.orig.tar.gz" +rm -r tarball-tmp "xalan-j_${version//./_}-src.tar.gz" diff --git a/xalan-j2.spec b/xalan-j2.spec index 9bbb9cc..39e686d 100644 --- a/xalan-j2.spec +++ b/xalan-j2.spec @@ -3,20 +3,20 @@ Name: xalan-j2 Version: 2.7.1 -Release: 39 +Release: 40 Epoch: 0 Summary: Java XSLT processor License: ASL 2.0 and W3C URL: http://xalan.apache.org/ Source0: %{name}-%{version}.tar.gz -Source1: http://repo1.maven.org/maven2/xalan/xalan/%{version}/xalan-%{version}.pom -Source2: http://repo1.maven.org/maven2/xalan/serializer/%{version}/serializer-%{version}.pom +Source1: https://repo1.maven.org/maven2/xalan/xalan/%{version}/xalan-%{version}.pom +Source2: https://repo1.maven.org/maven2/xalan/serializer/%{version}/serializer-%{version}.pom Source3: xsltc-%{version}.pom Source4: %{name}-MANIFEST.MF Source5: %{name}-serializer-MANIFEST.MF -Source6: generate-tarball.sh -Patch0: %{name}-noxsltcdeps.patch -Patch1: %{name}-CVE-2014-0107.patch +Source6: generate-tar.sh +Patch0000: %{name}-noxsltcdeps.patch +Patch0001: %{name}-CVE-2014-0107.patch BuildRequires: ant apache-parent bcel dos2unix glassfish-servlet-api java_cup @@ -131,5 +131,8 @@ mv %{_javadir}/jaxp_transform_impl.jar{.tmp,} || : %changelog +* Mon Mar 09 2020 yangjian - 0:2.7.1-40 +- Change Source to available address + * Tue Dec 3 2019 huyan - 0:2.7.1-39 - Package Initialization -- Gitee