SPECS: ant.spec - rel 3.1 - first try at fixing antRun breakage ca...

[baggins]

Author: baggins                      Date: Tue Sep 12 13:06:34 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- rel 3.1
- first try at fixing antRun breakage caused by our packaging

---- Files affected:
SPECS:
   ant.spec (1.66 -> 1.67) 

---- Diffs:

================================================================
Index: SPECS/ant.spec
diff -u SPECS/ant.spec:1.66 SPECS/ant.spec:1.67
--- SPECS/ant.spec:1.66	Fri Jul 21 13:40:00 2006
+++ SPECS/ant.spec	Tue Sep 12 15:06:29 2006
@@ -33,7 +33,7 @@
 %undefine	with_jsch
 %endif
 #
-%define		_rel	3
+%define		_rel	3.1
 Summary:	Ant build tool for Java
 Summary(fr):	Outil de compilation pour java
 Summary(it):	Tool per la compilazione di programmi java
@@ -47,6 +47,7 @@
 # Source0-md5:	80a7ad191c40b7d8c82533524b282b6b
 Source1:	%{name}.conf
 Patch0:		%{name}-ant_d.patch
+Patch1:		%{name}-antRun.patch
 URL:		http://ant.apache.org/
 %{?with_antlr:BuildRequires:	antlr}
 %{?with_apache_bsf:BuildRequires:	beanshell}
@@ -496,10 +497,15 @@
 %prep
 %setup -q -n apache-%{name}-%{version}
 %patch0 -p1
+%patch1 -p1
 
 # clean jar files
 find . -name "*.jar" -exec rm -f {} \;
 
+sed -i -e '|@BINDIR|%{_bindir}|g' \
+	src/main/org/apache/tools/ant/taskdefs/Exec.java \
+	src/main/org/apache/tools/ant/taskdefs/Execute.java
+
 %build
 export JAVA_HOME="%{java_home}"
 
@@ -840,6 +846,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.67  2006/09/12 13:06:29  baggins
+- rel 3.1
+- first try at fixing antRun breakage caused by our packaging
+
 Revision 1.66  2006/07/21 11:40:00  hawk
 - release 3
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/ant.spec?r1=1.66&r2=1.67&f=u