diff --git a/ant-contrib.spec b/ant-contrib.spec index 773f6f0..bedbfde 100644 --- a/ant-contrib.spec +++ b/ant-contrib.spec @@ -9,6 +9,9 @@ URL: http://ant-contrib.sourceforge.net/ Group: Development/Libraries Source0: https://downloads.sourceforge.net/project/ant-contrib/ant-contrib/1.0b3/ant-contrib-1.0b3-src.tar.bz2 Source1: http://mirrors.ibiblio.org/pub/mirrors/maven2/%{name}/%{name}/1.0b3/%{name}-1.0b3.pom +# ASL 2.0 Licence text +# Upstream bug at https://sourceforge.net/tracker/?func=detail&aid=3590371&group_id=36177&atid=416920 +Source2: http://www.apache.org/licenses/LICENSE-2.0.txt Patch0: local-ivy.patch Patch2: %{name}-antservertest.patch Patch3: %{name}-pom.patch @@ -45,6 +48,8 @@ Api documentation for %{name}. cp %{SOURCE1} %{name}-1.0b3.pom %patch3 -p1 +cp %{SOURCE2} LICENSE-2.0.txt + find -name '*.class' -exec rm -f '{}' \; find -name '*.jar' -exec rm -f '{}' \; @@ -76,16 +81,17 @@ install -pm 644 %{name}-1.0b3.pom $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.ant-%{name %{_javadir}/ant/*.jar %{_mavenpomdir}/* %{_mavendepmapfragdir}/* -%doc target/docs/LICENSE.txt +%doc target/docs/LICENSE.txt LICENSE-2.0.txt %doc target/docs/manual/tasks/* %files javadoc -%doc target/docs/LICENSE.txt +%doc target/docs/LICENSE.txt LICENSE-2.0.txt %doc %{_javadocdir}/%{name} %changelog * Tue Nov 27 2012 Tomas Radej - 1.0-0.19.b3 -- Added LICENSE to javadoc +- Added LICENSE to javadoc (#879349) +- Added ASL 2.0 licence text (#879354) * Tue Nov 13 2012 Tomas Radej - 1.0-0.18.b3 - Used correct upstream pom + patched it