davidcl pushed to jrosetta (master). "Update to the toolset xmvn features"

[notifications at fedoraproject.org]

From 6e578e3b3f7887d74b527e8a7ed4f9d5a4aef368 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20DAVID?=
 <clement.david at scilab-enterprises.com>
Date: Mon, 18 May 2015 11:36:47 +0200
Subject: Update to the toolset xmvn features


diff --git a/jrosetta.spec b/jrosetta.spec
index 0319d5a..f0bc3b6 100644
--- a/jrosetta.spec
+++ b/jrosetta.spec
@@ -1,6 +1,6 @@
 Name:           jrosetta
 Version:        1.0.4
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        A common base to build a graphical console
 
 Group:          Development/Libraries
@@ -11,22 +11,9 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 
-BuildRequires:  jpackage-utils
-BuildRequires:  java-devel
 BuildRequires:  maven-local
 
-BuildRequires:    maven-compiler-plugin
-BuildRequires:    maven-clean-plugin
-BuildRequires:    maven-dependency-plugin
-BuildRequires:    maven-install-plugin
-BuildRequires:    maven-jar-plugin
-BuildRequires:    maven-javadoc-plugin
-BuildRequires:    maven-release-plugin
-BuildRequires:    maven-resources-plugin
-BuildRequires:    maven-surefire-plugin
-BuildRequires:    maven-surefire-provider-junit4
-
-Requires:       jpackage-utils
+Requires:       javapackages-tools
 Requires:       java
 
 %description
@@ -56,45 +43,20 @@ rm CHANGE.txt.CRLF
 %pom_xpath_remove "pom:build/pom:extensions" pom.xml
 
 %build
-mvn-rpmbuild -e install javadoc:aggregate
+%mvn_build
 
 %install
-mkdir -p $RPM_BUILD_ROOT%{_javadir}
-
-cp -p modules/%{name}-api/target/%{name}-api-%{version}.jar \
-        $RPM_BUILD_ROOT%{_javadir}/%{name}-api.jar
-# for compatibility
-ln -s %{name}-api.jar \
-        $RPM_BUILD_ROOT%{_javadir}/%{name}-API.jar
-cp -p modules/%{name}-engine/target/%{name}-engine-%{version}.jar \
-        $RPM_BUILD_ROOT%{_javadir}/%{name}-engine.jar
-
-mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-cp -rp -t $RPM_BUILD_ROOT%{_javadocdir}/%{name} target/site/apidocs/*
-
-install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
-install -pm 644 pom.xml  \
-        $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
-install -pm 644 modules/%{name}-api/pom.xml  \
-        $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}-API.pom
-install -pm 644 modules/%{name}-engine/pom.xml  \
-        $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}-engine.pom
-
-%add_maven_depmap JPP-%{name}.pom
-%add_maven_depmap JPP-%{name}-API.pom %{name}-API.jar
-%add_maven_depmap JPP-%{name}-engine.pom %{name}-engine.jar
-
-%files
-%{_mavenpomdir}/JPP-%{name}.pom
-%{_mavenpomdir}/JPP-%{name}-*.pom
-%{_mavendepmapfragdir}/%{name}
-%{_javadir}/%{name}-*.jar
+%mvn_install
+
+%files -f .mfiles
 %doc LICENSE.txt COPYRIGHT.txt CHANGE.txt
 
-%files javadoc
-%{_javadocdir}/%{name}
+%files javadoc -f .mfiles-javadoc
 
 %changelog
+* Mon May 18 2015 Clément David <c.david86 at gmail.com> - 1.0.4-11
+- Update to the latest xmvn toolset features
+
 * Sun Jun 08 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.4-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/jrosetta.git/commit/?h=master&id=6e578e3b3f7887d74b527e8a7ed4f9d5a4aef368