[mimepull] Switch to xmvn

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


commit 6c4091cf000c0ad51d69f15ee2d5cff0293fce35
Author: Marek Goldmann <marek.goldmann at gmail.com>
Date:   Wed Jul 2 09:16:31 2014 +0200

    Switch to xmvn

 mimepull.spec |   38 ++++++++++----------------------------
 1 files changed, 10 insertions(+), 28 deletions(-)
---
diff --git a/mimepull.spec b/mimepull.spec
index 03a5849..b01b404 100644
--- a/mimepull.spec
+++ b/mimepull.spec
@@ -1,6 +1,6 @@
 Name:             mimepull
 Version:          1.8
-Release:          8%{?dist}
+Release:          9%{?dist}
 Summary:          Streaming API to access attachments from a MIME message
 Group:            Development/Libraries
 License:          CDDL and GPLv2 with exceptions
@@ -12,7 +12,6 @@ Source0:          mimepull-%{version}.tar.xz
 
 BuildArch:        noarch
 
-BuildRequires:    jpackage-utils
 BuildRequires:    java-devel
 BuildRequires:    maven-local
 BuildRequires:    maven-compiler-plugin
@@ -21,20 +20,17 @@ BuildRequires:    maven-jar-plugin
 BuildRequires:    maven-javadoc-plugin
 BuildRequires:    maven-release-plugin
 BuildRequires:    maven-surefire-plugin
-BuildRequires:    maven-surefire-provider-junit4
+BuildRequires:    maven-surefire-provider-junit
 BuildRequires:    maven-enforcer-plugin
 BuildRequires:    junit
 BuildRequires:    jvnet-parent
 
-Requires:         jpackage-utils
-
 %description
 Provides a streaming API to access attachments parts in a MIME message
 
 %package javadoc
 Summary:          Javadocs for %{name}
 Group:            Documentation
-Requires:         jpackage-utils
 
 %description javadoc
 This package contains the API documentation for %{name}.
@@ -46,36 +42,22 @@ iconv -f iso8859-1 -t utf-8 LICENSE > LICENSE.conv && mv -f LICENSE.conv LICENSE
 sed -i 's/\r//' LICENSE
 
 %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/mimepull-%{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
 
-%files javadoc
-%{_javadocdir}/%{name}
+%files javadoc -f .mfiles-javadoc
 %doc LICENSE
 
 %changelog
+* Wed Jul 02 2014 Marek Goldmann <mgoldman at redhat.com> - 1.8-9
+- Switch to xmvn
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.8-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 


More information about the scm-commits mailing list