[maven-native] switch to XMvn

Mon Jul 8 07:52:48 UTC 2013

commit 6aedb9d65352e68a3e30434170665d59ab1efd88
Author: gil <puntogil at libero.it>
Date:   Mon Jul 8 09:52:34 2013 +0200

    switch to XMvn

 maven-native.spec |  105 ++++++++++-------------------------------------------
 1 files changed, 20 insertions(+), 85 deletions(-)
---

diff --git a/maven-native.spec b/maven-native.spec
index 6ffbb6c..43b092d 100644
--- a/maven-native.spec
+++ b/maven-native.spec
@@ -4,9 +4,8 @@
 
 Name:          maven-native
 Version:       1.0
-Release:       0.3%{dotreltag}%{?dist}
+Release:       0.4%{dotreltag}%{?dist}
 Summary:       Compile c and c++ source under Maven
-Group:         Development/Libraries
 License:       ASL 2.0 and MIT
 Url:           http://mojo.codehaus.org/maven-native/
 Source0:       http://repo2.maven.org/maven2/org/codehaus/mojo/natives/%{name}/%{namedversion}/%{name}-%{namedversion}-source-release.zip
@@ -40,10 +39,6 @@ BuildRequires: maven-plugin-cobertura
 BuildRequires: maven-plugin-plugin
 BuildRequires: maven-surefire-provider-junit4
 
-Requires:      mvn(org.codehaus.plexus:plexus-container-default) >= 1.5.5
-Requires:      mvn(org.codehaus.plexus:plexus-utils)
-
-Requires:      java
 BuildArch:     noarch
 
 %description
@@ -51,35 +46,18 @@ Maven Native - compile C and C++ source under Maven
 with compilers such as GCC, MSVC, GCJ etc ...
 
 %package components
-Group:         Development/Libraries
 Summary:       Maven Native Components
-Requires:      %{name} = %{version}-%{release}
-Requires:      mvn(commons-lang:commons-lang)
-Requires:      mvn(org.codehaus.plexus:plexus-container-default) >= 1.5.5
-Requires:      mvn(org.codehaus.plexus:plexus-utils)
 
 %description components
 %{summary}.
 
 %package -n native-maven-plugin
-Group:         Development/Libraries
 Summary:       Native Maven Plugin
-Requires:      %{name} = %{version}-%{release}
-Requires:      %{name}-components = %{version}-%{release}
-Requires:      mvn(bcel:bcel)
-Requires:      mvn(org.apache.maven:maven-artifact)
-Requires:      mvn(org.apache.maven:maven-model)
-Requires:      mvn(org.apache.maven:maven-plugin-api)
-Requires:      mvn(org.apache.maven:maven-compat)
-Requires:      mvn(org.apache.maven:maven-core)
-Requires:      mvn(org.codehaus.plexus:plexus-archiver)
-Requires:      mvn(org.codehaus.plexus:plexus-utils)
 
 %description -n native-maven-plugin
 %{summary}.
 
 %package javadoc
-Group:         Documentation
 Summary:       Javadoc for %{name}
 
 %description javadoc
@@ -110,6 +88,15 @@ sed -i 's|<artifactId>maven-project|<artifactId>maven-compat|' pom.xml
 
 %build
 
+%mvn_package ":%{name}" %{name}
+%mvn_package ":%{name}-api" %{name}
+%mvn_package ":%{name}-components" components
+%mvn_package ":%{name}-bcc" components
+%mvn_package ":%{name}-generic-c" components
+%mvn_package ":%{name}-javah" components
+%mvn_package ":%{name}-manager" components
+%mvn_package ":%{name}-msvc" components
+%mvn_package ":native-maven-plugin" native-maven-plugin
 #  junit.framework.AssertionFailedError: Failed to create plexus container.
 # native-maven-plugin with maven3 test failures:
 # Caused by: java.lang.ClassNotFoundException: org.apache.maven.artifact.repository.Authentication
@@ -117,81 +104,29 @@ sed -i 's|<artifactId>maven-project|<artifactId>maven-compat|' pom.xml
 # method: getSnapshotArtifactRepository signature: ()Lorg/apache/maven/artifact/repository/ArtifactRepository;)
 # Incompatible argument to function
 # force org.codehaus.plexus plexus-container-default 1.5.5 apis
-mvn-rpmbuild -Dmojo.java.target=1.7 \
- -Dmaven.local.depmap.file="%{_mavendepmapfragdir}/plexus-containers-container-default" \
- -Dmaven.test.failure.ignore=true \
- package javadoc:aggregate
+%mvn_build -s -- -Dmojo.java.target=1.7 -Dmaven.local.depmap.file="%{_mavendepmapfragdir}/plexus-containers-container-default" -Dmaven.test.failure.ignore=true
 
 %install
+%mvn_install
 
-mkdir -p %{buildroot}%{_mavenpomdir}
-install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-%{name}.pom
-%add_maven_depmap JPP.%{name}-%{name}.pom
-
-mkdir -p %{buildroot}%{_javadir}/%{name}
-
-install -m 644 %{name}-api/target/%{name}-api-%{namedversion}.jar %{buildroot}%{_javadir}/%{name}/%{name}-api.jar
-install -pm 644 %{name}-api/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-%{name}-api.pom
-%add_maven_depmap JPP.%{name}-%{name}-api.pom %{name}/%{name}-api.jar
-
-install -m 644 native-maven-plugin/target/native-maven-plugin-%{namedversion}.jar %{buildroot}%{_javadir}/%{name}/native-maven-plugin.jar
-install -pm 644 native-maven-plugin/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-native-maven-plugin.pom
-%add_maven_depmap JPP.%{name}-native-maven-plugin.pom %{name}/native-maven-plugin.jar -f plugin
-mv -f %{buildroot}%{_mavendepmapfragdir}/%{name}-plugin %{buildroot}%{_mavendepmapfragdir}/native-maven-plugin
-
-(
-cd maven-native-components
-install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-components.pom
-%add_maven_depmap JPP.%{name}-components.pom -f components
-for m in bcc \
-      generic-c \
-      javah \
-      manager \
-      msvc; do
-    install -m 644 %{name}-${m}/target/%{name}-${m}-%{namedversion}.jar %{buildroot}%{_javadir}/%{name}/%{name}-${m}.jar
-    install -pm 644 %{name}-${m}/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-%{name}-${m}.pom
-%add_maven_depmap JPP.%{name}-%{name}-${m}.pom %{name}/%{name}-${m}.jar -f components
-done
-)
-
-mkdir -p %{buildroot}%{_javadocdir}/%{name}
-cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
-
-
-%files
+%files -f .mfiles-%{name}
 %dir %{_javadir}/%{name}
-%{_javadir}/%{name}/%{name}-api.jar
-%{_mavenpomdir}/JPP.%{name}-%{name}.pom
-%{_mavenpomdir}/JPP.%{name}-%{name}-api.pom
-%{_mavendepmapfragdir}/%{name}
 %doc LICENSE.txt
 
-%files components
-%{_javadir}/%{name}/%{name}-bcc.jar
-%{_javadir}/%{name}/%{name}-generic-c.jar
-%{_javadir}/%{name}/%{name}-javah.jar
-%{_javadir}/%{name}/%{name}-manager.jar
-%{_javadir}/%{name}/%{name}-msvc.jar
-%{_mavenpomdir}/JPP.%{name}-%{name}-bcc.pom
-%{_mavenpomdir}/JPP.%{name}-%{name}-generic-c.pom
-%{_mavenpomdir}/JPP.%{name}-%{name}-javah.pom
-%{_mavenpomdir}/JPP.%{name}-%{name}-manager.pom
-%{_mavenpomdir}/JPP.%{name}-%{name}-msvc.pom
-%{_mavenpomdir}/JPP.%{name}-components.pom
-%{_mavendepmapfragdir}/%{name}-components
+%files components -f .mfiles-components
 %doc LICENSE.txt
 
-%files -n native-maven-plugin
-%{_javadir}/%{name}/native-maven-plugin.jar
-%{_mavenpomdir}/JPP.%{name}-native-maven-plugin.pom
-%{_mavendepmapfragdir}/native-maven-plugin
+%files -n native-maven-plugin -f .mfiles-native-maven-plugin
 %doc LICENSE.txt
 
-%files javadoc
-%{_javadocdir}/%{name}
+%files javadoc -f .mfiles-javadoc
 %doc LICENSE.txt
 
 %changelog
+* Mon Jul 08 2013 gil cattaneo <puntogil at libero.it> 1.0-0.4.alpha.7
+- switch to XMvn
+- minor changes to adapt to current guideline
+
 * Tue Jun 11 2013 gil cattaneo <puntogil at libero.it> 1.0-0.3.alpha.7
 - fix license tag
 
