Author: glen Date: Mon Oct 24 08:22:43 2011 GMT Module: packages Tag: HEAD ---- Log message: - setup BuildRoot
---- Files affected: packages/ant-contrib: ant-contrib.spec (1.2 -> 1.3) ---- Diffs: ================================================================ Index: packages/ant-contrib/ant-contrib.spec diff -u packages/ant-contrib/ant-contrib.spec:1.2 packages/ant-contrib/ant-contrib.spec:1.3 --- packages/ant-contrib/ant-contrib.spec:1.2 Fri Oct 21 23:46:59 2011 +++ packages/ant-contrib/ant-contrib.spec Mon Oct 24 10:22:38 2011 @@ -15,9 +15,9 @@ Source0: http://downloads.sourceforge.net/ant-contrib/%{name}-%{version}%{subver}-src.tar.gz # Source0-md5: 66511dddcef3dc9798db33dbaca0d3de Patch0: build_xml.patch -Patch2: antservertest.patch -BuildRequires: ant-junit >= 1.6.2 +Patch1: antservertest.patch BuildRequires: ant >= 1.6 +BuildRequires: ant-junit >= 1.6.2 BuildRequires: java(jaxp_parser_impl) BuildRequires: java-bcel >= 5.0 BuildRequires: java-junit >= 3.8.0 @@ -28,6 +28,7 @@ Requires: java(jaxp_parser_impl) Requires: java-junit >= 3.8.0 BuildArch: noarch +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description The Ant-Contrib project is a collection of tasks (and at one point @@ -41,10 +42,9 @@ API documentation for Ant contrib tasks. %prep -%setup -q -n %{name} +%setup -q -n %{name} %patch0 -%patch2 - +%patch1 %undos manual/tasks/foreach.html manual/tasks/for.html %{__rm} -r test/src/net/sf/antcontrib/antclipse @@ -58,7 +58,6 @@ ln -sf $xerces_jar lib export OPT_JAR_LIST="ant/ant-junit junit" -export CLASSPATH= CLASSPATH=build/lib/ant-contrib-%{version}.jar:$CLASSPATH %ant jar %{?with_javadoc:docs} \ -Djavac.target=1.4 \ @@ -108,6 +107,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.3 2011/10/24 08:22:38 glen +- setup BuildRoot + Revision 1.2 2011/10/21 21:46:59 glen - builds now ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ant-contrib/ant-contrib.spec?r1=1.2&r2=1.3&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
