[maven2] Moved plugin-descriptor into subpackage

Tomas Radej tradej at fedoraproject.org
Mon Jan 23 14:23:39 UTC 2012


commit 72bdadb1d5018160e609dd2cffd4eff528a5a191
Author: Tomas Radej <tradej at redhat.com>
Date:   Mon Jan 23 11:19:37 2012 +0100

    Moved plugin-descriptor into subpackage

 maven2.spec |   23 +++++++++++++++++++++--
 1 files changed, 21 insertions(+), 2 deletions(-)
---
diff --git a/maven2.spec b/maven2.spec
index d90b928..bc15b97 100644
--- a/maven2.spec
+++ b/maven2.spec
@@ -3,7 +3,7 @@
 
 Name:	    maven2
 Version:	2.2.1
-Release:	29%{?dist}
+Release:	30%{?dist}
 Summary:	Java project management and project comprehension tool
 
 Group:		Development/Build Tools
@@ -233,6 +233,7 @@ Requires: maven-plugin-registry = %{version}-%{release}
 Requires: maven-profile = %{version}-%{release}
 Requires: maven-project = %{version}-%{release}
 Requires: maven-toolchain = %{version}-%{release}
+Requires: maven-plugin-descriptor = %{version}-%{release}
 %endif
 
 BuildArch: noarch
@@ -325,6 +326,14 @@ Requires:       jpackage-utils
 %description -n maven-toolchain
 Maven toolchain artifact
 
+%package -n maven-plugin-descriptor
+Group:          Development/Libraries
+Summary:        Maven Plugin Description Model
+Requires:       jpackage-utils
+
+%description -n maven-plugin-descriptor
+Maven toolchain artifact
+
 
 %prep
 %setup -q -n apache-maven-2.2.1
@@ -518,7 +527,7 @@ install -m 644 %{SOURCE105} $RPM_BUILD_ROOT%{_javadir}/%{name}/empty-dep.jar
 # parts of maven2 now go into separate subpackages
 for subdir in maven-artifact-manager maven-error-diagnostics \
               maven-model maven-monitor maven-plugin-registry \
-              maven-profile maven-project maven-toolchain;do
+              maven-profile maven-project 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%{_datadir}/%{name}/poms/JPP.%{name}-$subdir.pom
@@ -608,6 +617,7 @@ install -m 644 pom.xml $RPM_BUILD_ROOT%{_datadir}/%{name}/poms/JPP.%{name}-maven
 %exclude %{_datadir}/%{name}/poms/JPP.%{name}-maven-profile.pom
 %exclude %{_datadir}/%{name}/poms/JPP.%{name}-maven-project.pom
 %exclude %{_datadir}/%{name}/poms/JPP.%{name}-maven-toolchain.pom
+%exclude %{_datadir}/%{name}/poms/JPP.%{name}-maven-plugin-descriptor.pom
 %{_datadir}/%{name}/repository
 %{_mavendepmapfragdir}/%{name}
 %{_javadir}/%{name}
@@ -619,6 +629,7 @@ install -m 644 pom.xml $RPM_BUILD_ROOT%{_datadir}/%{name}/poms/JPP.%{name}-maven
 %exclude %{_javadir}/%{name}/maven-profile.jar
 %exclude %{_javadir}/%{name}/maven-project.jar
 %exclude %{_javadir}/%{name}/maven-toolchain.jar
+%exclude %{_javadir}/%{name}/maven-plugin-descriptor.jar
 
 
 %if %{bootstrap}
@@ -666,8 +677,16 @@ install -m 644 pom.xml $RPM_BUILD_ROOT%{_datadir}/%{name}/poms/JPP.%{name}-maven
 %{_javadir}/%{name}/maven-toolchain.jar
 %{_datadir}/%{name}/poms/JPP.%{name}-maven-toolchain.pom
 
+%files -n maven-plugin-descriptor
+%{_mavendepmapfragdir}/maven-plugin-descriptor
+%{_javadir}/%{name}/maven-plugin-descriptor.jar
+%{_datadir}/%{name}/poms/JPP.%{name}-maven-plugin-descriptor.pom
+
 
 %changelog
+* Mon Jan 23 2012 Tomas Radej <tradej at redhat.com> - 2.2.1-30
+- Moved plugin-descriptor into subpackage
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.1-29
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 


More information about the scm-commits mailing list