[geronimo-jaxrpc] Build with maven 3.

[Alexander Kurtakov]

commit 90dd4c3e09b5db31e563ff4fa469918f2a69a5b1
Author: Alexander Kurtakov < <akurtako at redhat.com>
Date:   Wed Nov 30 12:59:37 2011 +0200

    Build with maven 3.
    
    - Adapt to current guidelines.

 geronimo-jaxrpc.depmap |    2 +-
 geronimo-jaxrpc.spec   |   42 ++++++++++++------------------------------
 2 files changed, 13 insertions(+), 31 deletions(-)
---
diff --git a/geronimo-jaxrpc.depmap b/geronimo-jaxrpc.depmap
index c7aa536..432c706 100644
--- a/geronimo-jaxrpc.depmap
+++ b/geronimo-jaxrpc.depmap
@@ -6,7 +6,7 @@
         </maven>
         <jpp>
 	        <groupId>JPP</groupId>
-	        <artifactId>servlet_2_4_api</artifactId>
+	        <artifactId>tomcat6-servlet-2.5-api</artifactId>
 	        <version>2.4</version>
 	    </jpp>
     </dependency>
diff --git a/geronimo-jaxrpc.spec b/geronimo-jaxrpc.spec
index a272683..74a5be3 100644
--- a/geronimo-jaxrpc.spec
+++ b/geronimo-jaxrpc.spec
@@ -3,7 +3,7 @@
 
 Name:             geronimo-jaxrpc
 Version:          2.1
-Release:          3%{?dist}
+Release:          4%{?dist}
 Summary:          Java EE: Java API for XML Remote Procedure Call v1.1
 Group:            Development/Libraries
 License:          ASL 2.0
@@ -13,25 +13,23 @@ Source0:          http://repo2.maven.org/maven2/org/apache/geronimo/specs/%{spec
 Source1:          %{name}.depmap
 # Use parent pom files instead of unavailable 'genesis-java5-flava'
 Patch1:           use_parent_pom.patch
-BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:        noarch
 
 BuildRequires:    java-devel >= 1:1.6.0
 BuildRequires:    jpackage-utils
-BuildRequires:    maven2 >= 2.2.1
+BuildRequires:    maven
 BuildRequires:    geronimo-parent-poms
 BuildRequires:    maven-resources-plugin
 BuildRequires:    saaj_api
 BuildRequires:    geronimo-osgi-locator
 BuildRequires:    servlet >= 2.5
+BuildRequires:    maven-surefire-provider-junit
 
 Requires:         java >= 1:1.6.0
 Requires:         jpackage-utils
 Requires:         saaj_api
 Requires:         geronimo-osgi-locator
 Requires:         servlet >= 2.5
-Requires(post):   jpackage-utils
-Requires(postun): jpackage-utils
 
 Provides:         jaxrpc_api = %{spec_ver}
 
@@ -54,21 +52,14 @@ sed -i 's/\r//' LICENSE
 %patch1 -p0
 
 %build
-export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
-mvn-jpp \
-        -e \
-        -Dmaven2.jpp.mode=true \
-        -Dmaven2.jpp.depmap.file="%{SOURCE1}" \
-        -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
+mvn-rpmbuild \
+        -Dmaven.local.depmap.file="%{SOURCE1}" \
         install javadoc:javadoc
 
 %install
-rm -rf %{buildroot}
-
 # jars
 install -d -m 0755 %{buildroot}%{_javadir}
-install -m 644 target/%{spec_name}-%{version}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
-ln -s %{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
+install -m 644 target/%{spec_name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
 ln -s %{name}-%{version}.jar %{buildroot}%{_javadir}/jaxrpc.jar
 
 # poms
@@ -78,33 +69,24 @@ install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
 %add_to_maven_depmap javax.xml jaxrpc-api %{spec_ver} JPP %{name}
 
 # javadoc
-install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}-%{version}
-cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}-%{version}/
-ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
-
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
-
-%clean
-rm -rf %{buildroot}
+install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
+cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
 
 %files
-%defattr(-,root,root,-)
 %doc LICENSE
 %{_javadir}/*
 %{_mavenpomdir}/*
 %{_mavendepmapfragdir}/*
 
 %files javadoc
-%defattr(-,root,root,-)
 %doc LICENSE
-%{_javadocdir}/%{name}-%{version}
 %{_javadocdir}/%{name}
 
 %changelog
+* Wed Nov 30 2011 Alexander Kurtakov <akurtako at redhat.com> 2.1-4
+- Build with maven 3.
+- Adapt to current guidelines.
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild