From 7c0f07eb44cd3e074c4a5fd1111790dc0fb0df5f550d00fc34a700672f4bf34f Mon Sep 17 00:00:00 2001
From: OBS User autobuild <null@suse.de>
Date: Thu, 15 Apr 2010 21:50:18 +0000
Subject: [PATCH] Accepting request 37940 from Java:packages

Copy from Java:packages/ant based on submit request 37940 from user mvyskocil

OBS-URL: https://build.opensuse.org/request/show/37940
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ant?expand=0&rev=26
---
 ant-antlr.changes                 | 6 ++++++
 ant-antlr.spec                    | 5 ++---
 ant.changes                       | 6 ++++++
 ant.spec                          | 6 +++---
 apache-ant-1.7.1-src-suse.tar.bz2 | 3 +++
 apache-ant-1.7.1-src.tar.bz2      | 3 ---
 6 files changed, 20 insertions(+), 9 deletions(-)
 create mode 100644 apache-ant-1.7.1-src-suse.tar.bz2
 delete mode 100644 apache-ant-1.7.1-src.tar.bz2

diff --git a/ant-antlr.changes b/ant-antlr.changes
index 6af2b82..0acf046 100644
--- a/ant-antlr.changes
+++ b/ant-antlr.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Apr  9 10:42:30 UTC 2010 - mvyskocil@suse.cz
+
+- fix bnc#595144 - Compiled binary in ant
+  remove test.exe from source tarball
+
 -------------------------------------------------------------------
 Thu Mar 18 15:59:33 UTC 2010 - mvyskocil@suse.cz
 
diff --git a/ant-antlr.spec b/ant-antlr.spec
index 5210319..9fdae26 100644
--- a/ant-antlr.spec
+++ b/ant-antlr.spec
@@ -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:        7
+Release:        8
 %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.tar.bz2
+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
 Source3:        http://repo1.maven.org/maven2/org/apache/ant/ant-launcher/1.7.1/ant-launcher-1.7.1.pom
@@ -68,7 +68,6 @@ 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.changes b/ant.changes
index 573f476..c348539 100644
--- a/ant.changes
+++ b/ant.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Apr  9 10:41:42 UTC 2010 - mvyskocil@suse.cz
+
+- fix bnc#595144 - Compiled binary in ant
+  remove test.exe from source tarball
+
 -------------------------------------------------------------------
 Thu Mar 18 15:58:41 UTC 2010 - mvyskocil@suse.cz
 
diff --git a/ant.spec b/ant.spec
index 265d60d..e0b7948 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:        7
+Release:        8
 %if %bootstrap
 Summary:        Antlr Task for ant
 %else
@@ -37,7 +37,8 @@ Summary:        Antlr Task for ant
 License:        Apache Software License ..
 Url:            http://jakarta.apache.org/
 Group:          Development/Tools/Building
-Source0:        %{cvs_name}-%{version}-src.tar.bz2
+# 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
 Source3:        http://repo1.maven.org/maven2/org/apache/ant/ant-launcher/1.7.1/ant-launcher-1.7.1.pom
@@ -67,7 +68,6 @@ 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/apache-ant-1.7.1-src-suse.tar.bz2 b/apache-ant-1.7.1-src-suse.tar.bz2
new file mode 100644
index 0000000..239fd6a
--- /dev/null
+++ b/apache-ant-1.7.1-src-suse.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:305176617ba522c6b272fdd77d2063cd6231f5fa43a97bcd02dab7a1a365b3ea
+size 6923290
diff --git a/apache-ant-1.7.1-src.tar.bz2 b/apache-ant-1.7.1-src.tar.bz2
deleted file mode 100644
index 8cf7882..0000000
--- a/apache-ant-1.7.1-src.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4dc49a7260ef90a6dc6611b7e96b9f047d507589736d4a2ad6efbe3edfc6fba6
-size 6979386