[glassfish-saaj] Switch to xmvn

Marek Goldmann goldmann at fedoraproject.org
Wed Jul 2 07:39:16 UTC 2014


commit b644cda8b486de61de9d37097f6906043c26dba9
Author: Marek Goldmann <marek.goldmann at gmail.com>
Date:   Wed Jul 2 09:39:20 2014 +0200

    Switch to xmvn

 glassfish-saaj.spec |   38 +++++++++-----------------------------
 1 files changed, 9 insertions(+), 29 deletions(-)
---
diff --git a/glassfish-saaj.spec b/glassfish-saaj.spec
index 2bff2ac..f1afbda 100644
--- a/glassfish-saaj.spec
+++ b/glassfish-saaj.spec
@@ -1,6 +1,6 @@
 Name:             glassfish-saaj
 Version:          1.3.19
-Release:          6%{?dist}
+Release:          7%{?dist}
 Summary:          JSR-67 implementation
 Group:            Development/Libraries
 License:          CDDL and GPLv2 with exceptions
@@ -14,7 +14,6 @@ Source0:          glassfish-saaj-%{version}.tar.xz
 
 BuildArch:        noarch
 
-BuildRequires:    jpackage-utils
 BuildRequires:    java-devel
 BuildRequires:    maven-local
 BuildRequires:    maven-compiler-plugin
@@ -26,10 +25,6 @@ BuildRequires:    mimepull
 BuildRequires:    geronimo-saaj
 BuildRequires:    jvnet-parent
 
-Requires:         jpackage-utils
-Requires:         mimepull
-Requires:         geronimo-saaj
-
 %description
 Open source Reference Implementation of JSR-67: SOAP with Attachments
 API for Java (SAAJ MR: 1.3)
@@ -37,7 +32,6 @@ API for Java (SAAJ MR: 1.3)
 %package javadoc
 Summary:          Javadocs for %{name}
 Group:            Documentation
-Requires:         jpackage-utils
 
 %description javadoc
 This package contains the API documentation for %{name}.
@@ -46,36 +40,22 @@ This package contains the API documentation for %{name}.
 %setup -q
 
 %build
-mvn-rpmbuild package javadoc:aggregate
+%mvn_build
 
 %install
-install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-
-# JAR
-install -pm 644 target/saaj-impl-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
-
-# POM
-install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
+%mvn_install
 
-# DEPMAP
-%add_maven_depmap
-
-# APIDOCS
-cp -rp target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-
-%files
-%{_mavenpomdir}/*
-%{_mavendepmapfragdir}/*
-%{_javadir}/*
+%files -f .mfiles
+%dir %{_javadir}/%{name}
 %doc license.html
 
-%files javadoc
-%{_javadocdir}/%{name}
+%files javadoc -f .mfiles-javadoc
 %doc license.html
 
 %changelog
+* Wed Jul 02 2014 Marek Goldmann <mgoldman at redhat.com> - 1.3.19-7
+- Switch to xmvn
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.19-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 


More information about the scm-commits mailing list