[istack-commons/f22] Split into subpackages (Resolves: rhbz#1196653)

[Michal Srb]

commit 2e367d1f1300bc96c98df57df9af086621dd097d
Author: Michal Srb <msrb at redhat.com>
Date:   Fri Feb 27 10:48:34 2015 +0100

    Split into subpackages (Resolves: rhbz#1196653)

 istack-commons.spec | 87 ++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 79 insertions(+), 8 deletions(-)
---
diff --git a/istack-commons.spec b/istack-commons.spec
index c49200d..2d00827 100644
--- a/istack-commons.spec
+++ b/istack-commons.spec
@@ -1,6 +1,6 @@
 Name:           istack-commons
 Version:        2.21
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Common code for some Glassfish projects
 License:        CDDL and GPLv2 with exceptions
 URL:            http://istack-commons.java.net
@@ -14,30 +14,53 @@ BuildArch:      noarch
 
 BuildRequires:  maven-local
 BuildRequires:  mvn(args4j:args4j)
-BuildRequires:  mvn(com.sun.codemodel:codemodel) >= 2.6-4
+BuildRequires:  mvn(com.sun.codemodel:codemodel)
+BuildRequires:  mvn(com.sun:tools)
 BuildRequires:  mvn(dom4j:dom4j)
 BuildRequires:  mvn(junit:junit)
 BuildRequires:  mvn(net.java:jvnet-parent:pom:)
 BuildRequires:  mvn(org.apache.ant:ant)
 BuildRequires:  mvn(org.apache.ant:ant-junit)
+BuildRequires:  mvn(org.apache.felix:maven-bundle-plugin)
+BuildRequires:  mvn(org.apache.maven:maven-aether-provider)
+BuildRequires:  mvn(org.apache.maven:maven-compat)
+BuildRequires:  mvn(org.apache.maven:maven-core)
+BuildRequires:  mvn(org.apache.maven:maven-plugin-api)
+BuildRequires:  mvn(org.apache.maven:maven-project)
+BuildRequires:  mvn(org.apache.maven:maven-settings)
 BuildRequires:  mvn(org.apache.maven.plugins:maven-plugin-plugin)
+BuildRequires:  mvn(org.apache.maven.plugin-tools:maven-plugin-annotations)
 BuildRequires:  mvn(org.apache.maven.shared:file-management)
 BuildRequires:  mvn(org.apache.maven.wagon:wagon-http-lightweight)
 BuildRequires:  mvn(org.codehaus.mojo:build-helper-maven-plugin)
 BuildRequires:  mvn(org.codehaus.plexus:plexus-archiver)
+BuildRequires:  mvn(org.codehaus.plexus:plexus-component-metadata)
 BuildRequires:  mvn(org.codehaus.plexus:plexus-io)
+BuildRequires:  mvn(org.codehaus.plexus:plexus-utils)
+BuildRequires:  mvn(org.eclipse.aether:aether-api)
+BuildRequires:  mvn(org.eclipse.aether:aether-connector-basic)
+BuildRequires:  mvn(org.eclipse.aether:aether-impl)
+BuildRequires:  mvn(org.eclipse.aether:aether-spi)
 BuildRequires:  mvn(org.eclipse.aether:aether-transport-file)
+BuildRequires:  mvn(org.eclipse.aether:aether-transport-wagon)
+BuildRequires:  mvn(org.eclipse.aether:aether-util)
 BuildRequires:  mvn(org.testng:testng)
 
+Requires:       %{name}-buildtools
+Requires:       %{name}-runtime
+Requires:       %{name}-soimp
+Requires:       %{name}-test
+Requires:       %{name}-tools
+
 %description
 Code shared between JAXP, JAXB, SAAJ, and JAX-WS projects.
 
-%package -n %{name}-maven-plugin
+%package maven-plugin
 Summary:        istack-commons Maven Mojo
 Obsoletes:      maven-istack-commons-plugin < %{version}-%{release}
 Provides:       maven-istack-commons-plugin = %{version}-%{release}
 
-%description -n %{name}-maven-plugin
+%description maven-plugin
 This package contains the istack-commons Maven Mojo.
 
 %package -n import-properties-plugin
@@ -46,6 +69,36 @@ Summary:        istack-commons import properties plugin
 %description -n import-properties-plugin
 This package contains the istack-commons import properties Maven Mojo.
 
+%package buildtools
+Summary:        istack-commons buildtools
+
+%description buildtools
+This package contains istack-commons buildtools.
+
+%package runtime
+Summary:        istack-commons runtime
+
+%description runtime
+This package contains istack-commons runtime.
+
+%package soimp
+Summary:        istack-commons soimp
+
+%description soimp
+This package contains istack-commons soimp.
+
+%package test
+Summary:        istack-commons test
+
+%description test
+This package contains istack-commons test.
+
+%package tools
+Summary:        istack-commons tools
+
+%description tools
+This package contains istack-commons tools.
+
 %package javadoc
 Summary:        Javadoc for %{name}
 
@@ -66,22 +119,21 @@ This package contains the API documentation for %{name}.
 %mvn_file com.sun.istack:%{name}-test %{name}-test %{name}/%{name}-test
 %mvn_file com.sun.istack:%{name}-tools %{name}-tools %{name}/%{name}-tools
 
-%mvn_package com.sun.istack:%{name}-maven-plugin %{name}-maven-plugin
-%mvn_package com.sun.istack:import-properties-plugin import-properties-plugin
 # Unused & unavailable dep
 %pom_remove_dep org.sonatype.sisu:sisu-inject-plexus import-properties-plugin
 
+# get rid of scope "import", our tools don't know how to handle such deps
 %pom_remove_dep com.sun:tools tools
 %pom_add_dep com.sun:tools tools
 
 %build
 
-%mvn_build -- -Dproject.build.sourceEncoding=UTF-8
+%mvn_build -s -- -Dproject.build.sourceEncoding=UTF-8
 
 %install
 %mvn_install
 
-%files -f .mfiles
+%files -f .mfiles-istack-commons
 %dir %{_javadir}/%{name}
 %doc Licence.txt
 
@@ -91,10 +143,29 @@ This package contains the API documentation for %{name}.
 %files -n import-properties-plugin -f .mfiles-import-properties-plugin
 %doc Licence.txt
 
+%files buildtools -f .mfiles-istack-commons-buildtools
+%doc Licence.txt
+
+%files runtime -f .mfiles-istack-commons-runtime
+%doc Licence.txt
+
+%files soimp -f .mfiles-istack-commons-soimp
+%doc Licence.txt
+
+%files test -f .mfiles-istack-commons-test
+%doc Licence.txt
+
+%files tools -f .mfiles-istack-commons-tools
+%doc Licence.txt
+
 %files javadoc -f .mfiles-javadoc
 %doc Licence.txt
 
+
 %changelog
+* Fri Feb 27 2015 Michal Srb <msrb at redhat.com> - 2.21-2
+- Split into subpackages (Resolves: rhbz#1196653)
+
 * Wed Jan 21 2015 gil cattaneo <puntogil at libero.it> 2.21-1
 - update to 2.21
 - adapt to current guideline