Attachment 605575 Details for Bug 830933 – Updated patch for F18 and Rawhide, adding maven-artifact and maven-settings

[patch] Updated patch for F18 and Rawhide, adding maven-artifact and maven-settings

0001-Provide-compatibility-versions-for-maven-artifact-an.patch (text/plain), 4.23 KB, created by Michel Alexandre Salim on 2012-08-20 05:30:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michel Alexandre Salim

Created: 2012-08-20 05:30:17 UTC

Size: 4.23 KB

patch

obsolete

>From 114df51e263289995bc3bf92ed5d544ce8de0aac Mon Sep 17 00:00:00 2001
>From: Michel Alexandre Salim <salimma@fedoraproject.org>
>Date: Mon, 20 Aug 2012 12:28:12 +0700
>Subject: [PATCH] Provide compatibility versions for maven-artifact and
> -settings
>
>---
> maven2.spec | 45 +++++++++++++++++++++++++++++++++++++++++++--
> 1 file changed, 43 insertions(+), 2 deletions(-)
>
>diff --git a/maven2.spec b/maven2.spec
>index aff4674..20af30c 100644
>--- a/maven2.spec
>+++ b/maven2.spec
>@@ -5,7 +5,7 @@
> 
> Name:	    maven2
> Version:	2.2.1
>-Release:	36%{?dist}
>+Release:	37%{?dist}
> Summary:	Java project management and project comprehension tool
> 
> Group:		Development/Build Tools
>@@ -61,6 +61,16 @@ Apache Maven is a software project management and comprehension tool. Based on
> the concept of a project object model (POM), Maven can manage a project's
> build, reporting and documentation from a central piece of information.
> 
>+%package -n maven-artifact
>+Group:          Development/Libraries
>+Summary:        Compatibility Maven artifact artifact
>+Requires:       jpackage-utils
>+Requires:       plexus-utils
>+Requires:       plexus-containers-container-default
>+
>+%description -n maven-artifact
>+Maven artifact manager artifact
>+
> %package -n maven-artifact-manager
> Group:          Development/Libraries
> Summary:        Compatibility Maven artifact manager artifact
>@@ -69,6 +79,7 @@ Requires:       plexus-classworlds
> Requires:       plexus-utils
> Requires:       plexus-containers-container-default
> Requires:       backport-util-concurrent
>+Requires:       maven-artifact = %{version}-%{release}
> Requires:       maven-wagon
> 
> %description -n maven-artifact-manager
>@@ -130,6 +141,7 @@ Requires:       maven-artifact-manager = %{version}-%{release}
> Requires:       maven-profile = %{version}-%{release}
> Requires:       maven-plugin-registry = %{version}-%{release}
> Requires:       maven-model = %{version}-%{release}
>+Requires:       maven-settings = %{version}-%{release}
> Requires:       plexus-interpolation
> Requires:       plexus-utils
> Requires:       plexus-containers-container-default
>@@ -137,6 +149,18 @@ Requires:       plexus-containers-container-default
> %description -n maven-project
> Maven project artifact
> 
>+%package -n maven-settings
>+Group:          Development/Libraries
>+Summary:        Compatibility Maven settings artifact
>+Requires:       jpackage-utils
>+Requires:       maven-model = %{version}-%{release}
>+Requires:       plexus-interpolation
>+Requires:       plexus-utils
>+Requires:       plexus-containers-container-default
>+
>+%description -n maven-settings
>+Maven settings artifact
>+
> %package -n maven-toolchain
> Group:          Development/Libraries
> Summary:        Compatibility Maven toolchain artifact
>@@ -256,7 +280,11 @@ done
> # these parts are compatibility versions which are available in
> # maven-3.x as well. We default to maven-3, but if someone asks for
> # 2.x we provide few compat versions
>-for subdir in maven-model;do
>+for subdir in \
>+  maven-artifact \
>+  maven-model \
>+  maven-settings;
>+do
>      pushd $subdir
>      install -m 644 target/$subdir-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{main_pkg}/$subdir.jar
>      install -m 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{main_pkg}-$subdir.pom
>@@ -267,6 +295,11 @@ done
> 
> 
> 
>+%files -n maven-artifact
>+%{_mavendepmapfragdir}/%{name}-maven-artifact
>+%{_javadir}/%{main_pkg}/maven-artifact-2.*.jar
>+%{_mavenpomdir}/JPP.%{main_pkg}-maven-artifact-2.*.pom
>+
> %files -n maven-artifact-manager
> %{_mavendepmapfragdir}/%{name}-maven-artifact-manager
> %{_javadir}/%{main_pkg}/maven-artifact-manager.jar
>@@ -302,6 +335,11 @@ done
> %{_javadir}/%{main_pkg}/maven-project.jar
> %{_mavenpomdir}/JPP.%{main_pkg}-maven-project.pom
> 
>+%files -n maven-settings
>+%{_mavendepmapfragdir}/%{name}-maven-settings
>+%{_javadir}/%{main_pkg}/maven-settings-*.jar
>+%{_mavenpomdir}/JPP.%{main_pkg}-maven-settings-*.pom
>+
> %files -n maven-toolchain
> %{_mavendepmapfragdir}/%{name}-maven-toolchain
> %{_javadir}/%{main_pkg}/maven-toolchain.jar
>@@ -314,6 +352,9 @@ done
> 
> 
> %changelog
>+* Mon Aug 20 2012 Michel Salim <salimma@fedoraproject.org> - 2.2.1-37
>+- Provide compatibility versions for maven-artifact and -settings
>+
> * Thu Jul 26 2012 Stanislav Ochotnicky <sochotnicky@redhat.com> - 2.2.1-36
> - Remove mistaken epoch use in requires
> 
>-- 
>1.7.11.4
>

Actions: View | Diff

Attachments on bug 830933: 591054 | 591061 | 605575