[jaxb2-maven-plugin] switch to XMvn

gil gil at fedoraproject.org
Tue Jul 9 09:42:52 UTC 2013


commit 01c11a2438c5b128aca94b77203d9d4824b37181
Author: gil <puntogil at libero.it>
Date:   Tue Jul 9 11:42:34 2013 +0200

    switch to XMvn

 jaxb2-maven-plugin.spec |   49 +++++++++-------------------------------------
 1 files changed, 10 insertions(+), 39 deletions(-)
---
diff --git a/jaxb2-maven-plugin.spec b/jaxb2-maven-plugin.spec
index fa7eaf6..864850b 100644
--- a/jaxb2-maven-plugin.spec
+++ b/jaxb2-maven-plugin.spec
@@ -1,8 +1,7 @@
 Name:          jaxb2-maven-plugin
 Version:       1.5
-Release:       1%{?dist}
+Release:       2%{?dist}
 Summary:       JAXB-2 Maven Plugin
-Group:         Development/Libraries
 License:       ASL 2.0
 Url:           http://mojo.codehaus.org/jaxb2-maven-plugin/
 # svn export https://svn.codehaus.org/mojo/tags/jaxb2-maven-plugin-1.5
@@ -34,28 +33,10 @@ BuildRequires: maven-plugin-testing-harness
 BuildRequires: xmlunit
 
 BuildRequires: maven-local
-BuildRequires: maven-compiler-plugin
-BuildRequires: maven-jar-plugin
-BuildRequires: maven-javadoc-plugin
 BuildRequires: maven-invoker-plugin
 BuildRequires: maven-plugin-plugin
-BuildRequires: maven-resources-plugin
-BuildRequires: maven-surefire-plugin
 BuildRequires: maven-surefire-provider-junit4
 
-Requires:      glassfish-jaxb
-Requires:      mvn(org.apache.maven:maven-artifact)
-Requires:      mvn(org.apache.maven:maven-compat)
-Requires:      mvn(org.apache.maven:maven-core)
-Requires:      mvn(org.apache.maven:maven-model)
-Requires:      mvn(org.apache.maven:maven-plugin-api)
-#Requires:      mvn(org.apache.maven:maven-project)
-#Requires:      mvn(org.codehaus.plexus:plexus-build-api)
-Requires:      mvn(org.codehaus.plexus:plexus-compiler-api)
-Requires:      mvn(org.codehaus.plexus:plexus-utils)
-Requires:      mvn(org.sonatype.plexus:plexus-build-api)
-
-Requires:      java
 BuildArch:     noarch
 
 %description
@@ -64,13 +45,11 @@ XSDs based on the JAXB 2.1 implementation and to generate XSDs from
 JAXB-annotated Java classes.
 
 %package javadoc
-Group:         Documentation
 Summary:       Javadoc for %{name}
 
 %description javadoc
 This package contains javadoc for %{name}.
 
-
 %prep
 %setup -q
 
@@ -92,30 +71,22 @@ sed -i 's/\r//' LICENSE-2.0.txt
 
 %build
 
-mvn-rpmbuild package javadoc:aggregate
+%mvn_file :%{name} %{name}
+%mvn_build
 
 %install
+%mvn_install
 
-mkdir -p %{buildroot}%{_javadir}
-install -m 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
-
-mkdir -p %{buildroot}%{_mavenpomdir}
-install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
-%add_maven_depmap JPP-%{name}.pom %{name}.jar
-
-mkdir -p %{buildroot}%{_javadocdir}/%{name}
-cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/
-
-%files
-%{_javadir}/%{name}.jar
-%{_mavenpomdir}/JPP-%{name}.pom
-%{_mavendepmapfragdir}/%{name}
+%files -f .mfiles
 %doc LICENSE-2.0.txt
 
-%files javadoc
-%{_javadocdir}/%{name}
+%files javadoc -f .mfiles-javadoc
 %doc LICENSE-2.0.txt
 
 %changelog
+* Tue Jul 09 2013 gil cattaneo <puntogil at libero.it> 1.5-2
+- switch to XMvn
+- minor changes to adapt to current guideline
+
 * Thu May 09 2013 gil cattaneo <puntogil at libero.it> 1.5-1
 - initial rpm
\ No newline at end of file


More information about the scm-commits mailing list