Attachment 595928 Details for Bug 837270 – Update to 4.11

[patch] Update to 4.11

0001-Update-to-4.11.patch (text/plain), 3.36 KB, created by gil cattaneo on 2012-07-03 10:38:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: gil cattaneo

Created: 2012-07-03 10:38:02 UTC

Size: 3.36 KB

patch

obsolete

>From efcc0ce1b3e7d8ed6785d7ea2d87ceea268ba79e Mon Sep 17 00:00:00 2001
>From: gil <puntogil@libero.it>
>Date: Tue, 3 Jul 2012 10:34:28 +0200
>Subject: [PATCH] Update to 4.11
>
>---
> .gitignore                           |    1 +
> cargo-parent-4.11-wagon-webdav.patch |   18 ++++++++++++++++++
> cargo-parent.spec                    |   30 +++++++++++++-----------------
> sources                              |    2 +-
> 4 files changed, 33 insertions(+), 18 deletions(-)
> create mode 100644 cargo-parent-4.11-wagon-webdav.patch
>
>diff --git a/.gitignore b/.gitignore
>index fffd9fd..0537885 100644
>--- a/.gitignore
>+++ b/.gitignore
>@@ -1 +1,2 @@
> /cargo-parent-4.7.tar.gz
>+/cargo-parent-4.11.tar.gz
>diff --git a/cargo-parent-4.11-wagon-webdav.patch b/cargo-parent-4.11-wagon-webdav.patch
>new file mode 100644
>index 0000000..d491e0b
>--- /dev/null
>+++ b/cargo-parent-4.11-wagon-webdav.patch
>@@ -0,0 +1,18 @@
>+--- pom.xml	2011-12-26 17:25:31.000000000 +0100
>++++ pom.xml-gil	2012-07-03 10:27:45.597343102 +0200
>+@@ -501,13 +501,13 @@
>+       Codehaus is using WebDav for site deployment, so we need to use the correct
>+       Maven Wagon to access it.
>+     -->
>+-    <extensions>
>++    
>+   </build>
>+ 
>+   <reporting>
>diff --git a/cargo-parent.spec b/cargo-parent.spec
>index c616856..8a0d652 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-4.11-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
> 
>@@ -36,29 +36,25 @@ This package contains the cargo parent pom.
> %prep
> %setup -q
> 
>-
> %build
>-mvn-rpmbuild install
> 
>+mvn-rpmbuild install
> 
> %install
>+
> 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}
>-
>-
>-%post
>-%update_maven_depmap
>-
>-%postun
>-%update_maven_depmap
>+%add_maven_depmap JPP-%{name}.pom
> 
> %files
>-%{_mavenpomdir}/*
>-%{_mavendepmapfragdir}/*
>+%{_mavenpomdir}/JPP-%{name}.pom
>+%{_mavendepmapfragdir}/%{name}
> 
> %changelog
>+* Tue Jul 03 2012 gil cattaneo <puntogil@libero.it> 4.11-1
>+- update to 4.11
>+- adapt to current guideline
>+
> * Fri Apr 29 2011 Orion Poplawski <orion@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
>-- 
>1.7.7.6
>

Actions: View | Diff

Attachments on bug 837270: 595928