From 3a6d0c1a4bf3d3cda7cfaa6b27fa70b78200c28ba8b1d9e8137880d805cbbfab Mon Sep 17 00:00:00 2001
From: Michal Vyskocil <michal.vyskocil@gmail.com>
Date: Fri, 9 Apr 2010 10:43:13 +0000
Subject: [PATCH] - fix bnc#595144 - Compiled binary in ant   remove test.exe
 from source tarball

OBS-URL: https://build.opensuse.org/package/show/Java:packages/ant?expand=0&rev=8
---
 ant-antlr.spec | 7 ++++---
 ant.spec       | 3 ++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/ant-antlr.spec b/ant-antlr.spec
index 9fdae26..e720ea2 100644
--- a/ant-antlr.spec
+++ b/ant-antlr.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package ant-antlr (Version 1.7.1)
+# spec file for package ant (Version 1.7.1)
 #
 # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -29,7 +29,7 @@ Name:           ant-antlr
 # This line is not a comment, please do not remove it!
 #%(sh %{_sourcedir}/ant-antlr-prepare.sh %{_sourcedir} %{name})
 Version:        1.7.1
-Release:        8
+Release:        7
 %if %bootstrap
 Summary:        Antlr Task for ant
 %else
@@ -38,7 +38,7 @@ Summary:        Antlr Task for ant
 License:        Apache Software License ..
 Url:            http://jakarta.apache.org/
 Group:          Development/Tools/Building
-Source0:        %{cvs_name}-%{version}-src-suse.tar.bz2
+Source0:        %{cvs_name}-%{version}-src.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
 Source3:        http://repo1.maven.org/maven2/org/apache/ant/ant-launcher/1.7.1/ant-launcher-1.7.1.pom
@@ -68,6 +68,7 @@ Source26:       http://repo1.maven.org/maven2/org/apache/ant/ant-parent/1.7.1/an
 Source1000:     ant-antlr-prepare.sh
 # Fix some places where copies of classes are included in the wrong jarfiles
 Patch0:         apache-ant-jars.patch
+#Patch1:         apache-ant-bz163689.patch
 Patch2:         apache-ant-gnu-classpath.patch
 Patch3:         apache-ant-no-test-jar.patch
 # SUSE patches
diff --git a/ant.spec b/ant.spec
index e0b7948..ccc66e4 100644
--- a/ant.spec
+++ b/ant.spec
@@ -28,7 +28,7 @@ Name:           ant
 # This line is not a comment, please do not remove it!
 #%(sh %{_sourcedir}/ant-antlr-prepare.sh %{_sourcedir} %{name})
 Version:        1.7.1
-Release:        8
+Release:        7
 %if %bootstrap
 Summary:        Antlr Task for ant
 %else
@@ -68,6 +68,7 @@ Source26:       http://repo1.maven.org/maven2/org/apache/ant/ant-parent/1.7.1/an
 Source1000:     ant-antlr-prepare.sh
 # Fix some places where copies of classes are included in the wrong jarfiles
 Patch0:         apache-ant-jars.patch
+#Patch1:         apache-ant-bz163689.patch
 Patch2:         apache-ant-gnu-classpath.patch
 Patch3:         apache-ant-no-test-jar.patch
 # SUSE patches