[glassfish-ha-api] switch to XMvn

gil gil at fedoraproject.org
Mon Jul 8 05:05:04 UTC 2013


commit 711866fab8a8e49639faf038f7f963215f0905db
Author: gil <puntogil at libero.it>
Date:   Mon Jul 8 07:04:41 2013 +0200

    switch to XMvn

 glassfish-ha-api.spec |   35 ++++++-----------------------------
 1 files changed, 6 insertions(+), 29 deletions(-)
---
diff --git a/glassfish-ha-api.spec b/glassfish-ha-api.spec
index bae7477..9f77ba8 100644
--- a/glassfish-ha-api.spec
+++ b/glassfish-ha-api.spec
@@ -1,8 +1,7 @@
 Name:          glassfish-ha-api
 Version:       3.1.9
-Release:       1%{?dist}
+Release:       2%{?dist}
 Summary:       High Availability APIs and SPI
-Group:         Development/Libraries
 License:       CDDL or GPLv2 with exceptions
 URL:           http://glassfish.java.net/
 # svn export https://svn.java.net/svn/glassfish~svn/tags/ha-api-3.1.9 glassfish-ha-api-3.1.9
@@ -22,26 +21,16 @@ BuildRequires: junit
 
 BuildRequires: glassfish-hk2-maven-plugins
 BuildRequires: maven-local
-#BuildRequires: maven-compiler-plugin
 BuildRequires: maven-enforcer-plugin
 BuildRequires: maven-install-plugin
-#BuildRequires: maven-jar-plugin
-#BuildRequires: maven-javadoc-plugin
 BuildRequires: maven-plugin-bundle
-BuildRequires: maven-resources-plugin
-#BuildRequires: maven-surefire-plugin
-#BuildRequires: maven-surefire-provider-junit4
 
-Requires:      glassfish-hk2-api
-
-Requires:      java
 BuildArch:     noarch
 
 %description
 GlassFish High Availability APIs and SPI.
 
 %package javadoc
-Group:         Documentation
 Summary:       Javadoc for %{name}
 
 %description javadoc
@@ -75,28 +64,16 @@ sed -i 's/\r//' LICENSE.txt
 
 %build
 
-mvn-rpmbuild package javadoc:aggregate
+%mvn_file :%{oname} %{name}
+%mvn_build
 
 %install
+%mvn_install
 
-mkdir -p %{buildroot}%{_javadir}
-install -pm 644 target/ha-api-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
-
-mkdir -p %{buildroot}%{_mavenpomdir}
-install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
-%add_maven_depmap
-
-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.txt
 
-%files javadoc
-%{_javadocdir}/%{name}
+%files javadoc -f .mfiles-javadoc
 %doc LICENSE.txt
 
 %changelog


More information about the scm-commits mailing list