[apache-james-project] Update to latest upstream, use xmvn to build

[Stanislav Ochotnicky]

commit 237c94deb0cc8a77d5a6b164450275f0035becf7
Author: Stanislav Ochotnicky <sochotnicky at redhat.com>
Date:   Wed Jan 9 17:50:21 2013 +0100

    Update to latest upstream, use xmvn to build

 apache-james-project.spec |   65 +++++++++-----------------------------------
 1 files changed, 14 insertions(+), 51 deletions(-)
---
diff --git a/apache-james-project.spec b/apache-james-project.spec
index b689c3c..f1dbe2f 100644
--- a/apache-james-project.spec
+++ b/apache-james-project.spec
@@ -2,80 +2,43 @@
 %global short_name      apache-james
 
 Name:             %{short_name}-project
-Version:          1.6
-Release:          3%{?dist}
+Version:          1.8.1
+Release:          1%{?dist}
 Summary:          Main project POM files and resources
 License:          ASL 2.0
 Group:            Development/Libraries
 URL:              http://james.apache.org/
-Source0:          http://repo1.maven.org/maven2/org/apache/james/james-parent/%{version}/james-parent-%{version}-source-release.zip
+Source0:          http://repo1.maven.org/maven2/org/apache/james/james-project/%{version}/james-project-%{version}-source-release.zip
 BuildArch:        noarch
 
 BuildRequires:    java-devel >= 1:1.6.0
 BuildRequires:    jpackage-utils
-BuildRequires:    maven
+BuildRequires:    xmvn, maven-local
 BuildRequires:    maven-surefire-provider-junit4
-BuildRequires:    apache-commons-parent
 
-Requires:         maven
-Requires:         java >= 1:1.6.0
-Requires:         jpackage-utils
-Requires(post):   jpackage-utils
-Requires(postun): jpackage-utils
 
 %description
 Main project POM files and resources for Apache James project
 
-
 %prep
-%setup -q -n james-parent-%{version}
+%setup -q -n james-project-%{version}
+
+# generates erroneous runtime dependency
+%pom_remove_plugin :maven-doap-plugin
 
 %build
-# to build james skin for site plugin
-mvn-rpmbuild install
+%mvn_build
 
 %install
-# jars
-install -d -m 755 %{buildroot}%{_javadir}/%{short_name}
-install -p -m 644 maven-skin/target/maven-skin-%{version}.jar %{buildroot}%{_javadir}/%{short_name}/maven-skin.jar
-
-# poms
-install -d -m 755 %{buildroot}%{_mavenpomdir}
-install -pm 644 maven-skin/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{short_name}-maven-skin.pom
-%add_to_maven_depmap org.apache.james maven-skin %{version} JPP/%{short_name} maven-skin
-
-install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{short_name}-parent.pom
-%add_to_maven_depmap org.apache.james james-parent %{version} JPP/%{short_name} parent
-
-install -pm 644 project/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{short_name}-project.pom
-%add_to_maven_depmap org.apache.james james-project %{version} JPP/%{short_name} project
-
-install -pm 644 project/server/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{short_name}-server-root.pom
-%add_to_maven_depmap org.apache.james james-server-root %{version} JPP/%{short_name} server-root
+%mvn_install
 
-pom_ver=`echo %{server_ver} | tr . -`
-install -pm 644 project/server/%{server_ver}/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{short_name}-server-site.pom
-%add_to_maven_depmap org.apache.james james-server-site-$pom_ver %{version} JPP/%{short_name} server-site
-
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
-
-%files
-%defattr(-,root,root,-)
+%files -f .mfiles
 %doc LICENSE NOTICE
-%{_javadir}/%{short_name}/*.jar
-%{_mavenpomdir}/JPP.%{short_name}-maven-skin.pom
-%{_mavenpomdir}/JPP.%{short_name}-parent.pom
-%{_mavenpomdir}/JPP.%{short_name}-project.pom
-%{_mavenpomdir}/JPP.%{short_name}-server-root.pom
-%{_mavenpomdir}/JPP.%{short_name}-server-site.pom
-%{_mavendepmapfragdir}/*
-
 
 %changelog
+* Wed Jan 09 2013 Stanislav Ochotnicky <sochotnicky at redhat.com> - 1.8.1-1
+- Update to latest upstream, use xmvn to build
+
 * Wed Jul 18 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild