From 4835d6e682afb3fce397af5a91901da495f2ad18 Mon Sep 17 00:00:00 2001
From: Alexander Kurtakov <akurtako@redhat.com>
Date: Tue, 1 Nov 2011 10:04:34 +0200
Subject: [PATCH] Update to latest upstream release.

---
 .gitignore               |  1 +
 fix-ant-1.8.2.patch      | 13 -------------
 fix-deps.patch           | 30 ++++++++++--------------------
 maven-antrun-plugin.spec | 26 +++++++++-----------------
 sources                  |  2 +-
 5 files changed, 21 insertions(+), 51 deletions(-)
 delete mode 100644 fix-ant-1.8.2.patch

diff --git a/.gitignore b/.gitignore
index b275842..c660df7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 maven-antrun-plugin-1.4.tar.xz
 maven-antrun-plugin-1.5-source-release.zip
+maven-antrun-plugin-1.7-source-release.zip
diff --git a/fix-ant-1.8.2.patch b/fix-ant-1.8.2.patch
deleted file mode 100644
index bc3ee06..0000000
--- a/fix-ant-1.8.2.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- pom.xml.sav	2011-01-10 10:33:07.000000000 +0200
-+++ pom.xml	2011-01-10 10:35:17.354126766 +0200
-@@ -72,8 +72,8 @@ under the License.
-     </dependency>
-     <dependency>
-       <groupId>org.apache.ant</groupId>
--      <artifactId>ant-nodeps</artifactId>
--      <version>1.8.1</version>
-+      <artifactId>ant</artifactId>
-+      <version>1.8.2</version>
-     </dependency>
-     <dependency>
-       <groupId>org.codehaus.plexus</groupId>
diff --git a/fix-deps.patch b/fix-deps.patch
index 9eb0910..db16e0b 100644
--- a/fix-deps.patch
+++ b/fix-deps.patch
@@ -1,24 +1,14 @@
---- pom.xml.sav	2010-05-25 19:35:37.000000000 +0300
-+++ pom.xml	2010-08-31 06:29:27.741235987 +0300
-@@ -75,6 +75,21 @@ under the License.
-       <artifactId>ant-nodeps</artifactId>
-       <version>1.8.1</version>
+--- pom.xml.orig	2011-10-28 20:00:32.000000000 +0300
++++ pom.xml	2011-11-01 09:52:35.921717462 +0200
+@@ -71,6 +71,11 @@ under the License.
+       <version>${mavenVersion}</version>
      </dependency>
-+    <dependency>
-+      <groupId>org.codehaus.plexus</groupId>
-+      <artifactId>plexus-container-default</artifactId>
-+      <version>1.5.4</version>
-+    </dependency>
-+    <dependency>
+     <dependency>
 +      <groupId>org.apache.maven</groupId>
-+      <artifactId>maven-model</artifactId>
-+      <version>1.0</version>
++      <artifactId>maven-compat</artifactId>
++      <version>${mavenVersion}</version>
 +    </dependency>
 +    <dependency>
-+      <groupId>org.apache.ant</groupId>
-+      <artifactId>ant-launcher</artifactId>
-+      <version>1.8.1</version>
-+    </dependency>
-   </dependencies>
- 
-   <profiles>
+       <groupId>org.codehaus.plexus</groupId>
+       <artifactId>plexus-utils</artifactId>
+       <version>2.0.5</version>
diff --git a/maven-antrun-plugin.spec b/maven-antrun-plugin.spec
index c8350dc..e5fd9da 100644
--- a/maven-antrun-plugin.spec
+++ b/maven-antrun-plugin.spec
@@ -1,6 +1,6 @@
 Name:           maven-antrun-plugin
-Version:        1.6
-Release:        4%{?dist}
+Version:        1.7
+Release:        1%{?dist}
 Summary:        Maven AntRun Plugin
 
 Group:          Development/Libraries
@@ -8,7 +8,6 @@ License:        ASL 2.0
 URL:            http://maven.apache.org/plugins/maven-antrun-plugin/
 Source0:        http://repo2.maven.org/maven2/org/apache/maven/plugins/%{name}/%{version}/%{name}-%{version}-source-release.zip 
 Patch0:         fix-deps.patch
-Patch1:         fix-ant-1.8.2.patch
 
 BuildArch: noarch
 
@@ -28,8 +27,6 @@ Requires: ant
 Requires: maven
 Requires: jpackage-utils
 Requires: java
-Requires(post): jpackage-utils
-Requires(postun): jpackage-utils 
 
 Obsoletes: maven2-plugin-antrun <= 0:2.0.8
 Provides: maven2-plugin-antrun = 1:%{version}-%{release}
@@ -45,11 +42,10 @@ Requires: jpackage-utils
 %description javadoc
 API documentation for %{name}.
 
-
 %prep
 %setup -q 
 %patch0
-%patch1
+#%patch1
 
 %build
 mvn-rpmbuild install javadoc:javadoc
@@ -59,23 +55,16 @@ mvn-rpmbuild install javadoc:javadoc
 install -d -m 0755 %{buildroot}%{_javadir}
 install -m 644 target/%{name}-%{version}.jar   %{buildroot}%{_javadir}/%{name}.jar
 
-%add_to_maven_depmap org.apache.maven.plugins maven-antrun-plugin %{version} JPP maven-antrun-plugin
-
 # poms
 install -d -m 755 %{buildroot}%{_mavenpomdir}
-install -pm 644 pom.xml \
-    %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
+install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
+
+%add_maven_depmap JPP-%{name}.pom %{name}.jar
 
 # javadoc
 install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
 cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
 
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
-
 %files
 %doc LICENSE NOTICE
 %{_javadir}/*
@@ -87,6 +76,9 @@ cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
 %{_javadocdir}/%{name}
 
 %changelog
+* Tue Nov 1 2011 Alexander Kurtakov <akurtako@redhat.com> 1.7-1
+- Update to 1.7 upstream release.
+
 * Wed Jun 8 2011 Alexander Kurtakov <akurtako@redhat.com> 1.6-4
 - Build with maven 3.x.
 
diff --git a/sources b/sources
index f51e810..07e1e02 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-26799f9f89c2a0397dc4750de344a62d  maven-antrun-plugin-1.6-source-release.zip
+2d9aff265a1db57a742b1e82ff400b21  maven-antrun-plugin-1.7-source-release.zip