diff --git a/.velocity.metadata b/.velocity.metadata index 52daf08..d971a3a 100644 --- a/.velocity.metadata +++ b/.velocity.metadata @@ -1 +1 @@ -513c8a8c2aa4459d777a53634fc331bfd986e033 SOURCES/velocity-1.7.tar.gz +ac76c23153cd2214591b6783f255ad210467b2f8 SOURCES/velocity-1.7.tar.gz diff --git a/SOURCES/generate-tarball.sh b/SOURCES/generate-tarball.sh new file mode 100755 index 0000000..a86a470 --- /dev/null +++ b/SOURCES/generate-tarball.sh @@ -0,0 +1,21 @@ +#!/bin/bash +set -e + +name=velocity +version="$(sed -n 's/Version:\s*//p' *.spec)" + +# RETRIEVE +wget "http://www.apache.org/dist/${name}/engine/${version}/${name}-${version}.tar.gz" -O "${name}-${version}.orig.tar.gz" + +rm -rf tarball-tmp +mkdir tarball-tmp +cd tarball-tmp +tar xf "../${name}-${version}.orig.tar.gz" + +# CLEAN TARBALL +rm -r */*.jar +rm -r */lib + +tar cf "../${name}-${version}.tar.gz" * +cd .. +rm -r tarball-tmp "${name}-${version}.orig.tar.gz" diff --git a/SPECS/velocity.spec b/SPECS/velocity.spec index 6800b15..c6b97eb 100644 --- a/SPECS/velocity.spec +++ b/SPECS/velocity.spec @@ -2,15 +2,18 @@ Name: velocity Version: 1.7 -Release: 22%{?dist} +Release: 24%{?dist} Epoch: 0 Summary: Java-based template engine License: ASL 2.0 URL: http://velocity.apache.org/ BuildArch: noarch -Source0: http://www.apache.org/dist/%{name}/engine/%{version}/%{name}-%{version}.tar.gz +# ./generate-tarball.sh +Source0: %{name}-%{version}.tar.gz Source1: http://repo1.maven.org/maven2/org/apache/%{name}/%{name}/%{version}/%{name}-%{version}.pom +# Remove bundled binaries which cannot be easily verified for licensing +Source2: generate-tarball.sh Patch0: 0001-Remove-avalon-logkit.patch Patch1: 0004-Use-log4j-1.2.17.patch @@ -192,6 +195,12 @@ cp -pr examples test %{buildroot}%{_datadir}/%{name} %{_datadir}/%{name} %changelog +* Tue Jul 31 2018 Michael Simacek - 0:1.7-24 +- Repack the tarball without binaries + +* Sat Jul 14 2018 Fedora Release Engineering - 0:1.7-23 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Fri Feb 09 2018 Fedora Release Engineering - 0:1.7-22 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild