[ant-contrib/f18] Used correct upstream pom + patched it

[Tomas Radej]

commit 872eb3096fe7f27740282c08d8bb500e8dd8af56
Author: Tomas Radej <tradej at redhat.com>
Date:   Tue Nov 13 14:46:52 2012 +0100

    Used correct upstream pom + patched it

 ant-contrib-1.0b3.pom |    2 +-
 ant-contrib-pom.patch |   13 +++++++++++++
 ant-contrib.spec      |   13 ++++++++++---
 3 files changed, 24 insertions(+), 4 deletions(-)
---
diff --git a/ant-contrib-1.0b3.pom b/ant-contrib-1.0b3.pom
index ca99233..59dea4a 100644
--- a/ant-contrib-1.0b3.pom
+++ b/ant-contrib-1.0b3.pom
@@ -17,7 +17,7 @@
   <description>A collection of tasks (and at one point maybe types and other tools) for Apache Ant</description>
   <dependencies>
     <dependency>
-      <groupId>org.apache.ant</groupId>
+      <groupId>ant</groupId>
       <artifactId>ant</artifactId>
       <version>1.5</version>
     </dependency>
diff --git a/ant-contrib-pom.patch b/ant-contrib-pom.patch
new file mode 100644
index 0000000..e6d42f3
--- /dev/null
+++ b/ant-contrib-pom.patch
@@ -0,0 +1,13 @@
+diff --git a/ant-contrib-1.0b3.pom b/ant-contrib-1.0b3.pom
+index 59dea4a..ca99233 100644
+--- a/ant-contrib-1.0b3.pom
++++ b/ant-contrib-1.0b3.pom
+@@ -17,7 +17,7 @@
+   <description>A collection of tasks (and at one point maybe types and other tools) for Apache Ant</description>
+   <dependencies>
+     <dependency>
+-      <groupId>ant</groupId>
++      <groupId>org.apache.ant</groupId>
+       <artifactId>ant</artifactId>
+       <version>1.5</version>
+     </dependency>
diff --git a/ant-contrib.spec b/ant-contrib.spec
index b2e122b..ae67251 100644
--- a/ant-contrib.spec
+++ b/ant-contrib.spec
@@ -3,14 +3,15 @@
 Summary:        Collection of tasks for Ant
 Name:           ant-contrib
 Version:        1.0
-Release:        0.17.%{beta_number}%{?dist}
+Release:        0.18.%{beta_number}%{?dist}
 License:        ASL 2.0
 URL:            http://ant-contrib.sourceforge.net/
 Group:          Development/Libraries
 Source0:        https://downloads.sourceforge.net/project/ant-contrib/ant-contrib/1.0b3/ant-contrib-1.0b3-src.tar.bz2
 Source1:        http://mirrors.ibiblio.org/pub/mirrors/maven2/%{name}/%{name}/1.0b3/%{name}-1.0b3.pom
 Patch0:         local-ivy.patch
-Patch2:         ant-contrib-antservertest.patch
+Patch2:         %{name}-antservertest.patch
+Patch3:         %{name}-pom.patch
 BuildRequires:  jpackage-utils >= 1.5
 BuildRequires:  junit >= 3.8.0
 BuildRequires:  ant-junit >= 1.6.2
@@ -41,6 +42,9 @@ Api documentation for %{name}.
 %patch0 -b .sav
 %patch2
 
+cp %{SOURCE1} %{name}-1.0b3.pom
+%patch3 -p1
+
 find -name '*.class' -exec rm -f '{}' \;
 find -name '*.jar' -exec rm -f '{}' \;
 
@@ -63,7 +67,7 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ant.d
 echo "ant/ant-contrib" > $RPM_BUILD_ROOT%{_sysconfdir}/ant.d/ant-contrib
 
 install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
-install -pm 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.ant-%{name}.pom
+install -pm 644 %{name}-1.0b3.pom $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.ant-%{name}.pom
 
 %add_maven_depmap JPP.ant-%{name}.pom ant/%{name}.jar
 
@@ -79,6 +83,9 @@ install -pm 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.ant-%{name}.pom
 %doc %{_javadocdir}/%{name}
 
 %changelog
+* Tue Nov 13 2012 Tomas Radej <tradej at redhat.com> - 1.0-0.18.b3
+- Used correct upstream pom + patched it
+
 * Wed Jul 18 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-0.17.b3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild