diff --git a/ant-contrib.changes b/ant-contrib.changes index c76adfc..f0c4b6c 100644 --- a/ant-contrib.changes +++ b/ant-contrib.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jul 7 09:25:13 UTC 2014 - tchvatal@suse.com + +- Clean up a bit with spec-cleaner + ------------------------------------------------------------------- Fri Nov 15 08:25:16 UTC 2013 - mvyskocil@suse.com diff --git a/ant-contrib.spec b/ant-contrib.spec index 67267d4..43bd612 100644 --- a/ant-contrib.spec +++ b/ant-contrib.spec @@ -1,7 +1,7 @@ # # spec file for package ant-contrib # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -31,9 +31,7 @@ Source2: http://www.apache.org/licenses/LICENSE-2.0.txt Patch0: local-ivy.patch Patch1: ant-contrib-antservertest.patch Patch2: ant-contrib-pom.patch - BuildRequires: ant >= 1.7.1 -%requires_eq ant BuildRequires: apache-ivy BuildRequires: bcel >= 5.1 BuildRequires: commons-httpclient @@ -42,11 +40,11 @@ BuildRequires: java-devel BuildRequires: javapackages-tools BuildRequires: junit BuildRequires: xerces-j2 - Requires: junit >= 3.8.1 Requires: xerces-j2 -BuildArch: noarch +%requires_eq ant BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildArch: noarch %description The Ant-Contrib project is a collection of tasks (and at one point @@ -71,8 +69,8 @@ Api documentation for %{name}. %setup -q -n %{name} cp %{SOURCE1} %{name}-1.0b3.pom cp %{SOURCE2} LICENSE-2.0.txt -%patch0 -p0 -%patch1 -p0 +%patch0 +%patch1 %patch2 -p1 find . -name '*.jar' -or -name '*.class' -exec rm -rf {} +