packages: ant/ant.spec, ant/no-resourcecount.patch (NEW)=?UTF-8?Q?=20?=- allow bootstrap ...

[glen]

Author: glen                         Date: Tue May  8 05:18:26 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- allow bootstrap build from ant 1.6.5

---- Files affected:
packages/ant:
   ant.spec (1.126 -> 1.127) , no-resourcecount.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/ant/ant.spec
diff -u packages/ant/ant.spec:1.126 packages/ant/ant.spec:1.127
--- packages/ant/ant.spec:1.126	Sat Jun 12 21:50:19 2010
+++ packages/ant/ant.spec	Tue May  8 07:18:20 2012
@@ -46,16 +46,15 @@
 %undefine	with_netrexx
 %endif
 
+%define		rel	11
 %include	/usr/lib/rpm/macros.java
-
-%define		_rel	11
 Summary:	Ant build tool for Java
 Summary(fr.UTF-8):	Outil de compilation pour java
 Summary(it.UTF-8):	Tool per la compilazione di programmi java
 Summary(pl.UTF-8):	Ant - narzędzie do budowania w Javie
 Name:		ant
 Version:	1.7.1
-Release:	%{bootstrap_release %_rel}
+Release:	%{bootstrap_release %rel}
 License:	Apache
 Group:		Development/Languages/Java
 Source0:	http://www.apache.org/dist/ant/source/apache-%{name}-%{version}-src.tar.bz2
@@ -65,6 +64,7 @@
 # patch1 has been applied to ant sources in svn. It won't be needed for the
 # next release of ant.
 Patch1:		%{name}-gcjtask.patch
+Patch2:		no-resourcecount.patch
 URL:		http://ant.apache.org/
 %{?with_antlr:BuildRequires:	antlr}
 %{!?with_bootstrap:BuildRequires:	ant}
@@ -539,6 +539,7 @@
 %setup -q -n apache-%{name}-%{version}
 %patch0 -p1
 %patch1 -p1
+%{?with_bootstrap:%patch2 -p1}
 
 # clean jar files
 find . -name "*.jar" -exec rm -f {} \;
@@ -903,6 +904,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.127  2012/05/08 05:18:20  glen
+- allow bootstrap build from ant 1.6.5
+
 Revision 1.126  2010/06/12 19:50:19  pawelz
 - more jakarta -> java deps updated. Thx glen.
 - rel 11

================================================================
Index: packages/ant/no-resourcecount.patch
diff -u /dev/null packages/ant/no-resourcecount.patch:1.1
--- /dev/null	Tue May  8 07:18:26 2012
+++ packages/ant/no-resourcecount.patch	Tue May  8 07:18:21 2012
@@ -0,0 +1,22 @@
+https://ant.apache.org/manual/Tasks/resourcecount.html
+
+Display or set a property containing the size of a nested Resource Collection.
+Can also be used as a condition. Since Apache Ant 1.7
+
+--- apache-ant-1.7.1/build.xml~	2008-06-27 08:05:23.000000000 +0300
++++ apache-ant-1.7.1/build.xml	2012-05-08 08:09:17.536508489 +0300
+@@ -501,12 +501,14 @@
+ 
+     <condition property="tests.are.on.system.classpath">
+       <or>
++		  <!--
+         <resourcecount count="1">
+           <intersect>
+             <path path="${java.class.path}" />
+             <file file="${build.tests}" />
+           </intersect>
+         </resourcecount>
++		-->
+         <istrue value="${junit.fork}"/>
+       </or>
+     </condition>
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/ant/ant.spec?r1=1.126&r2=1.127