[java-sig-commits] [maven2] Add maven-toolchain subpackage

Stanislav Ochotnicky sochotni at fedoraproject.org
Mon Jun 27 11:18:38 UTC 2011 

commit 1816b5f2c86fb67b62a91ba921d12d4546c21301
Author: Stanislav Ochotnicky <sochotnicky at redhat.com>
Date:   Mon Jun 27 12:45:12 2011 +0200

    Add maven-toolchain subpackage

 maven2.spec |  104 ++++++++++++++++++++++------------------------------------
 1 files changed, 40 insertions(+), 64 deletions(-)
---
diff --git a/maven2.spec b/maven2.spec
index 8b1e059..d27c6f2 100644
--- a/maven2.spec
+++ b/maven2.spec
@@ -3,7 +3,7 @@
 
 Name:	    maven2
 Version:	2.2.1
-Release:	24%{?dist}
+Release:	25%{?dist}
 Summary:	Java project management and project comprehension tool
 
 Group:		Development/Build Tools
@@ -227,6 +227,10 @@ Requires: slf4j
 Requires: velocity
 Requires: maven-project = %{version}-%{release}
 Requires: maven-artifact-manager = %{version}-%{release}
+Requires: maven-profile = %{version}-%{release}
+Requires: maven-monitor = %{version}-%{release}
+Requires: maven-plugin-registry = %{version}-%{release}
+Requires: maven-toolchain = %{version}-%{release}
 %endif
 
 BuildArch: noarch
@@ -302,6 +306,14 @@ Requires:       plexus-containers-container-default
 %description -n maven-plugin-registry
 Maven plugin registry artifact
 
+%package -n maven-toolchain
+Group:          Development/Libraries
+Summary:        Compatibility Maven toolchain artifact
+Requires:       jpackage-utils
+
+%description -n maven-toolchain
+Maven toolchain artifact
+
 
 %prep
 %setup -q -n apache-maven-2.2.1
@@ -492,75 +504,26 @@ install -m 644 %{SOURCE105} $RPM_BUILD_ROOT%{_javadir}/%{name}/empty-dep.jar
 # Individual jars #
 ###################
 
-# artifact-manager and project go into separate fragments
-subdir="maven-artifact-manager"
-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
-%add_to_maven_depmap org.apache.maven $subdir %{version} JPP/%{name} $subdir
-popd
-
-mv $RPM_BUILD_ROOT%{_mavendepmapfragdir}/%{name} \
-   $RPM_BUILD_ROOT%{_mavendepmapfragdir}/$subdir
-
-subdir="maven-project"
-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
-%add_to_maven_depmap org.apache.maven $subdir %{version} JPP/%{name} $subdir
-popd
-
-mv $RPM_BUILD_ROOT%{_mavendepmapfragdir}/%{name} \
-   $RPM_BUILD_ROOT%{_mavendepmapfragdir}/$subdir
-
-subdir="maven-plugin-registry"
-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
-%add_to_maven_depmap org.apache.maven $subdir %{version} JPP/%{name} $subdir
-popd
-
-mv $RPM_BUILD_ROOT%{_mavendepmapfragdir}/%{name} \
-   $RPM_BUILD_ROOT%{_mavendepmapfragdir}/$subdir
-
-subdir="maven-monitor"
-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
-%add_to_maven_depmap org.apache.maven $subdir %{version} JPP/%{name} $subdir
-popd
-
-mv $RPM_BUILD_ROOT%{_mavendepmapfragdir}/%{name} \
-   $RPM_BUILD_ROOT%{_mavendepmapfragdir}/$subdir
-
-subdir="maven-model"
-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
-%add_to_maven_depmap org.apache.maven $subdir %{version} JPP/%{name} $subdir
-%add_to_maven_depmap org.apache.maven maven-model-v3 %{version} JPP/%{name} $subdir
-popd
-
-mv $RPM_BUILD_ROOT%{_mavendepmapfragdir}/%{name} \
-   $RPM_BUILD_ROOT%{_mavendepmapfragdir}/$subdir
-
-subdir="maven-profile"
-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
-%add_to_maven_depmap org.apache.maven $subdir %{version} JPP/%{name} $subdir
-popd
-
-mv $RPM_BUILD_ROOT%{_mavendepmapfragdir}/%{name} \
-   $RPM_BUILD_ROOT%{_mavendepmapfragdir}/$subdir
+# parts of maven2 now go into separate subpackages
+for subdir in maven-artifact-manager maven-project \
+               maven-plugin-registry maven-monitor maven-model \
+               maven-profile maven-toolchain;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
+     %add_to_maven_depmap org.apache.maven $subdir %{version} JPP/%{name} $subdir
+     mv $RPM_BUILD_ROOT%{_mavendepmapfragdir}/%{name} \
+        $RPM_BUILD_ROOT%{_mavendepmapfragdir}/$subdir
+     popd
+done
+
+
 
 for file in \
     maven-script/maven-script-ant/target/maven-script-ant-%{version}.jar \
     maven-script/maven-script-beanshell/target/maven-script-beanshell-%{version}.jar \
     apache-maven/target/apache-maven-%{version}.jar \
     maven-artifact-test/target/maven-artifact-test-%{version}.jar \
-    maven-toolchain/target/maven-toolchain-%{version}.jar \
-    maven-toolchain/target/original-maven-toolchain-%{version}.jar \
     maven-settings/target/maven-settings-%{version}.jar \
     maven-plugin-parameter-documenter/target/maven-plugin-parameter-documenter-%{version}.jar \
     maven-artifact/target/maven-artifact-%{version}.jar \
@@ -630,6 +593,11 @@ install -m 644 pom.xml $RPM_BUILD_ROOT%{_datadir}/%{name}/poms/JPP.%{name}-maven
 %{_datadir}/%{name}/poms
 %exclude %{_datadir}/%{name}/poms/JPP.%{name}-maven-artifact-manager.pom
 %exclude %{_datadir}/%{name}/poms/JPP.%{name}-maven-project.pom
+%exclude %{_datadir}/%{name}/poms/JPP.%{name}-maven-plugin-registry.pom
+%exclude %{_datadir}/%{name}/poms/JPP.%{name}-maven-monitor.pom
+%exclude %{_datadir}/%{name}/poms/JPP.%{name}-maven-model.pom
+%exclude %{_datadir}/%{name}/poms/JPP.%{name}-maven-profile.pom
+%exclude %{_datadir}/%{name}/poms/JPP.%{name}-maven-toolchain.pom
 %{_datadir}/%{name}/repository
 %{_mavendepmapfragdir}
 %{_javadir}/%{name}
@@ -669,8 +637,16 @@ install -m 644 pom.xml $RPM_BUILD_ROOT%{_datadir}/%{name}/poms/JPP.%{name}-maven
 %{_javadir}/%{name}/maven-profile.jar
 %{_datadir}/%{name}/poms/JPP.%{name}-maven-profile.pom
 
+%files -n maven-toolchain
+%{_mavendepmapfragdir}/maven-toolchain
+%{_javadir}/%{name}/maven-toolchain.jar
+%{_datadir}/%{name}/poms/JPP.%{name}-maven-toolchain.pom
+
 
 %changelog
+* Mon Jun 27 2011 Stanislav Ochotnicky <sochotnicky at redhat.com> - 2.2.1-25
+- Add maven-toolchain subpackage
+
 * Fri Jun 24 2011 Stanislav Ochotnicky <sochotnicky at redhat.com> - 2.2.1-24
 - Add few new subpackages
 - Add several missing requires to new subpackages

More information about the java-sig-commits mailing list