Attachment 591061 Details for Bug 830933 – Updated patch for maven2.spec

[patch] Updated patch for maven2.spec

0001-Also-separately-package-maven-artifact-and-maven-set.patch (text/plain), 4.25 KB, created by Michel Alexandre Salim on 2012-06-12 02:34:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michel Alexandre Salim

Created: 2012-06-12 02:34:18 UTC

Size: 4.25 KB

patch

obsolete

>From 970f7acaadb38cba7c6449dadbb6d468577d78fe Mon Sep 17 00:00:00 2001
>From: Michel Alexandre Salim <salimma@fedoraproject.org>
>Date: Tue, 12 Jun 2012 08:21:32 +0700
>Subject: [PATCH] Also separately package maven-artifact and maven-settings
>
>---
> maven2.spec |   45 ++++++++++++++++++++++++++++++++++++++++++---
> 1 file changed, 42 insertions(+), 3 deletions(-)
>
>diff --git a/maven2.spec b/maven2.spec
>index 971ef49..4bd1c98 100644
>--- a/maven2.spec
>+++ b/maven2.spec
>@@ -3,7 +3,7 @@
> 
> Name:	    maven2
> Version:	2.2.1
>-Release:	33%{?dist}
>+Release:	34%{?dist}
> Summary:	Java project management and project comprehension tool
> 
> Group:		Development/Build Tools
>@@ -59,6 +59,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 artifact
>+
> %package -n maven-artifact-manager
> Group:          Development/Libraries
> Summary:        Compatibility Maven artifact manager artifact
>@@ -67,6 +77,7 @@ Requires:       plexus-classworlds
> Requires:       plexus-utils
> Requires:       plexus-containers-container-default
> Requires:       backport-util-concurrent
>+Requires:       maven-artifact
> Requires:       maven-wagon
> 
> %description -n maven-artifact-manager
>@@ -128,6 +139,7 @@ Requires:       maven-artifact-manager
> Requires:       maven-profile
> Requires:       maven-plugin-registry
> Requires:       maven-model
>+Requires:       maven-settings
> Requires:       plexus-interpolation
> Requires:       plexus-utils
> Requires:       plexus-containers-container-default
>@@ -135,6 +147,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
>+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
>@@ -251,9 +275,11 @@ install -dm 755 $RPM_BUILD_ROOT%{_mavenpomdir}
> 
> 
> # parts of maven2 now go into separate subpackages
>-for subdir in maven-artifact-manager maven-error-diagnostics \
>+for subdir in maven-artifact maven-artifact-manager maven-error-diagnostics \
>               maven-model maven-monitor maven-plugin-registry \
>-              maven-profile maven-project maven-toolchain maven-plugin-descriptor ;do
>+              maven-profile maven-project maven-settings maven-toolchain \
>+              maven-plugin-descriptor;
>+do
>      pushd $subdir
>      install -m 644 target/$subdir-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/$subdir.jar
>      install -m 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-$subdir.pom
>@@ -264,6 +290,11 @@ done
> 
> 
> 
>+%files -n maven-artifact
>+%{_mavendepmapfragdir}/%{name}-maven-artifact
>+%{_javadir}/%{name}/maven-artifact.jar
>+%{_mavenpomdir}/JPP.%{name}-maven-artifact.pom
>+
> %files -n maven-artifact-manager
> %{_mavendepmapfragdir}/%{name}-maven-artifact-manager
> %{_javadir}/%{name}/maven-artifact-manager.jar
>@@ -299,6 +330,11 @@ done
> %{_javadir}/%{name}/maven-project.jar
> %{_mavenpomdir}/JPP.%{name}-maven-project.pom
> 
>+%files -n maven-settings
>+%{_mavendepmapfragdir}/%{name}-maven-settings
>+%{_javadir}/%{name}/maven-settings.jar
>+%{_mavenpomdir}/JPP.%{name}-maven-settings.pom
>+
> %files -n maven-toolchain
> %{_mavendepmapfragdir}/%{name}-maven-toolchain
> %{_javadir}/%{name}/maven-toolchain.jar
>@@ -311,6 +347,9 @@ done
> 
> 
> %changelog
>+* Tue Jun 12 2012 Michel Salim <salimma@fedoraproject.org> - 2.2.1-34
>+- Also separately package maven-artifact and maven-settings
>+
> * Wed May  9 2012 Stanislav Ochotnicky <sochotnicky@redhat.com> - 2.2.1-33
> - Completely remove main package since it was just confusing
> 
>-- 
>1.7.10.2
>

Actions: View | Diff

Attachments on bug 830933: 591054 | 591061 | 605575