[geronimo-jpa] Build with Maven 3

[Stanislav Ochotnicky]

commit 5c6e649ba81e8347fe9b47704669a1e44f554bec
Author: Stanislav Ochotnicky <sochotnicky at redhat.com>
Date:   Fri Nov 25 14:34:34 2011 +0100

    Build with Maven 3
    
    - Fix packaging problems

 geronimo-jpa.spec |   56 +++++++++++++++++-----------------------------------
 1 files changed, 18 insertions(+), 38 deletions(-)
---
diff --git a/geronimo-jpa.spec b/geronimo-jpa.spec
index 72bda4f..4891b52 100644
--- a/geronimo-jpa.spec
+++ b/geronimo-jpa.spec
@@ -3,7 +3,7 @@
 
 Name:           geronimo-jpa
 Version:        1.1.1
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Java persistence API implementation
 
 Group:          Development/Libraries
@@ -16,7 +16,6 @@ URL:            http://geronimo.apache.org/
 # tar caf geronimo-jpa_3.0_spec-1.1.1.tar.xz geronimo-jpa_3.0_spec-1.1.1
 Source0:       %{spec_name}-%{version}.tar.xz
 
-BuildRoot:     %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch:     noarch
 
 # This pulls in all of the required java and maven stuff
@@ -26,10 +25,6 @@ BuildRequires:  maven-resources-plugin
 Provides:       jpa_api = %{spec_ver}
 
 Requires:       java >= 1:1.6.0
-Requires:       geronimo-parent-poms
-
-Requires(post): jpackage-utils
-Requires(postun): jpackage-utils
 
 
 %description
@@ -51,66 +46,51 @@ Requires:  jpackage-utils
 %setup -q -n %{spec_name}-%{version}
 
 %build
-export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
-mkdir -p $MAVEN_REPO_LOCAL
-
-mvn-jpp \
-        -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
-        install javadoc:javadoc
+mvn-rpmbuild 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 jpa.jar
+ln -sf %{name}.jar %{spec_name}-%{version}.jar
+ln -sf %{name}.jar jpa.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}
+cp -pr target/site/apidocs/* $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.persistence persistence-api %{spec_ver} 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.persistence:persistence-api'
 
+%pre javadoc
+# workaround for rpm bug, can be removed in F-20
+[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
+rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
 
 %files
-%defattr(-,root,root,-)
 %doc LICENSE.txt NOTICE.txt
 %{_javadir}/*.jar
-%config(noreplace) %{_mavendepmapfragdir}/%{name}
-%{_mavenpomdir}/*.pom
+%{_mavenpomdir}/JPP-%{name}.pom
+%{_mavendepmapfragdir}/%{name}
 
 %files javadoc
-%defattr(-,root,root,-)
 %doc LICENSE.txt NOTICE.txt
-%{_javadocdir}/%{name}-%{version}
 %{_javadocdir}/%{name}
 
 
 
 %changelog
+* Fri Nov 25 2011 Stanislav Ochotnicky <sochotnicky at redhat.com> - 1.1.1-6
+- Build with Maven 3
+- Fix packaging problems
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild