[cargo-parent: 2/2] Update to 4.11 Update spec to current guidelines

[Orion Poplawski]

commit f43b588d4d766570aafdf64aa17fbf4e1940cf64
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Tue Jul 3 09:08:21 2012 -0600

    Update to 4.11
    Update spec to current guidelines

 cargo-parent-wagon-webdav.patch |   19 +++++++++++++++++++
 cargo-parent.spec               |   25 ++++++++++++-------------
 sources                         |    2 +-
 3 files changed, 32 insertions(+), 14 deletions(-)
---
diff --git a/cargo-parent-wagon-webdav.patch b/cargo-parent-wagon-webdav.patch
new file mode 100644
index 0000000..dc3160c
--- /dev/null
+++ b/cargo-parent-wagon-webdav.patch
@@ -0,0 +1,19 @@
+diff -up cargo-parent-4.11/pom.xml.wagon-webdav cargo-parent-4.11/pom.xml
+--- cargo-parent-4.11/pom.xml.wagon-webdav	2011-12-26 09:25:31.000000000 -0700
++++ cargo-parent-4.11/pom.xml	2012-07-03 09:04:01.121080624 -0600
+@@ -501,6 +501,7 @@
+       Codehaus is using WebDav for site deployment, so we need to use the correct
+       Maven Wagon to access it.
+     -->
++    <!--
+     <extensions>
+       <extension>
+         <groupId>org.apache.maven.wagon</groupId>
+@@ -508,6 +509,7 @@
+         <version>1.0-beta-2</version>
+       </extension>
+     </extensions>
++    -->
+   </build>
+ 
+   <reporting>
diff --git a/cargo-parent.spec b/cargo-parent.spec
index c616856..ccc2145 100644
--- a/cargo-parent.spec
+++ b/cargo-parent.spec
@@ -1,13 +1,15 @@
 Name:           cargo-parent
-Version:        4.7
+Version:        4.11
 Release:        1%{?dist}
 Summary:        Parent pom file for cargo.codehaus.org project
 
 Group:          Development/Libraries
 License:        ASL 2.0
 URL:            http://cargo.codehaus.org/
-#svn export http://svn.codehaus.org/cargo/pom/tags/cargo-parent-4.7/
+#svn export http://svn.codehaus.org/cargo/pom/tags/cargo-parent-4.11/
 Source0:        %{name}-%{version}.tar.gz
+# Remove wagon-webdav
+Patch0:         cargo-parent-wagon-webdav.patch
 
 BuildArch:      noarch
 
@@ -25,8 +27,6 @@ BuildRequires:    maven-surefire-plugin
 BuildRequires:  codehaus-parent
 
 Requires:       jpackage-utils
-Requires(post):       jpackage-utils
-Requires(postun):     jpackage-utils
 Requires:       java
 Requires:       codehaus-parent
 
@@ -35,6 +35,7 @@ This package contains the cargo parent pom.
 
 %prep
 %setup -q
+%patch0 -p1 -b .wagon-webdav
 
 
 %build
@@ -46,19 +47,17 @@ install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
 install -pm 644 pom.xml  \
         $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
 
-%add_to_maven_depmap org.codehaus.cargo cargo-parent %{version} JPP %{name}
+%add_maven_depmap JPP-%{name}.pom
 
 
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
-
 %files
-%{_mavenpomdir}/*
-%{_mavendepmapfragdir}/*
+%{_mavenpomdir}/JPP-%{name}.pom
+%{_mavendepmapfragdir}/%{name}
 
 %changelog
+* Tue Jul 3 2012 Orion Poplawski <orion at cora.nwra.com> 4.11-1
+- Update to 4.11
+- Update spec to current guidelines
+
 * Fri Apr 29 2011 Orion Poplawski <orion at cora.nwra.com> 4.7-1
 - Initial package
diff --git a/sources b/sources
index f3c2e4b..59ff67c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-70421696a2b52096550ce3614033a297  cargo-parent-4.7.tar.gz
+59fe53f2dcd8f8c06d603e6f3b325178  cargo-parent-4.11.tar.gz