[geronimo-jms] Use maven 3 to build

[Stanislav Ochotnicky]

commit ba6d606055a1e65122a68cb632ce2739d3e94ef1
Author: Stanislav Ochotnicky <sochotnicky at redhat.com>
Date:   Thu Nov 24 17:50:54 2011 +0100

    Use maven 3 to build
    
    - Update according to latest guidelines

 geronimo-jms.spec |   56 +++++++++++++++++-----------------------------------
 1 files changed, 18 insertions(+), 38 deletions(-)
---
diff --git a/geronimo-jms.spec b/geronimo-jms.spec
index c41f53b..3fdcc2f 100644
--- a/geronimo-jms.spec
+++ b/geronimo-jms.spec
@@ -2,7 +2,7 @@
 
 Name:		geronimo-jms
 Version:	1.1.1
-Release:	8%{?dist}
+Release:	9%{?dist}
 Summary:	J2EE JMS v1.1 API
 
 Group:		Development/Libraries
@@ -18,10 +18,7 @@ BuildArch:	noarch
 
 # This pulls in almost all of the required java and maven stuff
 BuildRequires:	geronimo-parent-poms
-BuildRequires:	maven2-plugin-resources
-
-Requires(post):	jpackage-utils
-Requires(postun): jpackage-utils
+BuildRequires:	maven-resources-plugin
 
 # Ensure a smooth transition from geronimo-specs
 Provides:	jms = %{version}-%{release}
@@ -49,64 +46,47 @@ BuildArch:	noarch
 
 
 %build
-export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
-mkdir -p $MAVEN_REPO_LOCAL
-
-mvn-jpp \
-	-Dmaven.repo.local=$MAVEN_REPO_LOCAL \
+mvn-rpmbuild \
 	-Dmaven.test.skip=true \
 	install javadoc:javadoc
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
 
 install -m 644 target/%{spec_name}-%{version}.jar \
-  $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
-(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
+  $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
+
 # Also provide compat symlinks
-pushd $RPM_BUILD_ROOT%{_javadir} 
-ln -sf %{name}-%{version}.jar %{spec_name}-%{version}.jar
-ln -sf %{name}-%{version}.jar jms.jar
+pushd $RPM_BUILD_ROOT%{_javadir}
+ln -sf %{name}.jar %{spec_name}.jar
+ln -sf %{name}.jar jms.jar
 popd
 
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-(cd $RPM_BUILD_ROOT%{_javadocdir} && ln -sf %{name}-%{version} %{name})
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
 install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
 install -pm 644 pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{name}.pom
 
-%add_to_maven_depmap org.apache.geronimo.specs %{spec_name} %{version} JPP %{name}
-%add_to_maven_depmap javax.jms jms %{version} JPP %{name}    
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
-
+%add_maven_depmap JPP-%{name}.pom %{name}.jar -a "javax.jms:jms"
 
 %files
-%defattr(-,root,root,-)
 %doc LICENSE.txt NOTICE.txt
-%{_javadir}/*.jar
+%{_javadir}/%{name}.jar
+%{_javadir}/%{spec_name}.jar
+%{_javadir}/jms.jar
 %{_mavendepmapfragdir}/%{name}
-%{_mavenpomdir}/*.pom
+%{_mavenpomdir}/JPP-%{name}.pom
 
 %files javadoc
-%defattr(-,root,root,-)
-%{_javadocdir}/%{name}-%{version}
 %{_javadocdir}/%{name}
 
 
-
 %changelog
+* Thu Nov 24 2011 Stanislav Ochotnicky <sochotnicky at redhat.com> - 1.1.1-9
+- Use maven 3 to build
+- Update according to latest guidelines
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.1-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild