fix the build failure with antlr-bootstrap

OBS-URL: https://build.opensuse.org/package/show/Java:packages/ant?expand=0&rev=14

ant-antlr.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Nov  4 09:43:06 UTC 2010 - mvyskocil@suse.cz
+
+- Fix build with antlr-bootstrap 
+
 -------------------------------------------------------------------
 Fri Apr  9 10:42:30 UTC 2010 - mvyskocil@suse.cz
 

ant-antlr.spec

@@ -30,14 +30,11 @@ Name:           ant-antlr
 #%(sh %{_sourcedir}/ant-antlr-prepare.sh %{_sourcedir} %{name})
 Version:        1.7.1
 Release:        15
-%if %bootstrap
 Summary:        Antlr Task for ant
-%else
-Summary:        Antlr Task for ant
-%endif
 License:        Apache Software License ..
 Url:            http://jakarta.apache.org/
 Group:          Development/Tools/Building
+# rm src/etc/testcases/taskdefs/zip/test.exe
 Source0:        %{cvs_name}-%{version}-src-suse.tar.bz2
 Source2:        %{cvs_name}-%{major_version}.ant.conf
 Source1:        http://repo1.maven.org/maven2/org/apache/ant/ant/1.7.1/ant-1.7.1.pom
@@ -66,6 +63,7 @@ Source24:       http://repo1.maven.org/maven2/org/apache/ant/ant-swing/1.7.1/ant
 Source25:       http://repo1.maven.org/maven2/org/apache/ant/ant-trax/1.7.1/ant-trax-1.7.1.pom
 Source26:       http://repo1.maven.org/maven2/org/apache/ant/ant-parent/1.7.1/ant-parent-1.7.1.pom
 Source1000:     ant-antlr-prepare.sh
+Source1001:     README.PACKAGER
 # Fix some places where copies of classes are included in the wrong jarfiles
 Patch0:         apache-ant-jars.patch
 Patch2:         apache-ant-gnu-classpath.patch
@@ -75,6 +73,7 @@ Patch103:       apache-ant-source-level.patch
 BuildRequires:  jpackage-utils >= 1.7.5
 BuildRequires:  java-1_5_0-gcj-compat-devel
 BuildRequires:  antlr-bootstrap
+#!BuildIgnore:  antlr antlr-java
 BuildRequires:  unzip
 BuildRequires:  xerces-j2-bootstrap
 BuildRequires:  xml-commons-apis-bootstrap
@@ -85,7 +84,6 @@ BuildRequires:  ant
 BuildRequires:  junit
 BuildRequires:  xml-commons-apis
 BuildRequires:  xerces-j2
-#!BuildIgnore:  antlr
 %endif
 %if %bootstrap
 Requires:       xerces-j2 >= 2.7.1-2
@@ -494,7 +492,7 @@ find . -name "*.jar" | %{_bindir}/xargs -t rm
 %build
 export OPT_JAR_LIST=:
 %if ! %bootstrap
-export CLASSPATH=$(build-classpath xerces-j2 xml-commons-apis antlr bcel jaf javamail/mailapi jdepend junit log4j oro regexp bsf commons-logging commons-net jsch xml-commons-resolver)
+export CLASSPATH=$(build-classpath xerces-j2 xml-commons-apis antlr-bootstrap bcel jaf javamail/mailapi jdepend junit log4j oro regexp bsf commons-logging commons-net jsch xml-commons-resolver)
 %{ant} jars
 %{ant} javadocs
 %else

ant.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Nov  4 09:43:24 UTC 2010 - mvyskocil@suse.cz
+
+- Fix the summary 
+
 -------------------------------------------------------------------
 Tue Aug 31 12:08:16 UTC 2010 - mvyskocil@suse.cz
 

ant.spec

@@ -29,11 +29,7 @@ Name:           ant
 #%(sh %{_sourcedir}/ant-antlr-prepare.sh %{_sourcedir} %{name})
 Version:        1.7.1
 Release:        15
-%if %bootstrap
+Summary:        Java-based build tool
-Summary:        Antlr Task for ant
-%else
-Summary:        Antlr Task for ant
-%endif
 License:        Apache Software License ..
 Url:            http://jakarta.apache.org/
 Group:          Development/Tools/Building
@@ -66,6 +62,7 @@ Source24:       http://repo1.maven.org/maven2/org/apache/ant/ant-swing/1.7.1/ant
 Source25:       http://repo1.maven.org/maven2/org/apache/ant/ant-trax/1.7.1/ant-trax-1.7.1.pom
 Source26:       http://repo1.maven.org/maven2/org/apache/ant/ant-parent/1.7.1/ant-parent-1.7.1.pom
 Source1000:     ant-antlr-prepare.sh
+Source1001:     README.PACKAGER
 # Fix some places where copies of classes are included in the wrong jarfiles
 Patch0:         apache-ant-jars.patch
 Patch2:         apache-ant-gnu-classpath.patch