[javacc-maven-plugin] Build with maven 3.

[Alexander Kurtakov]

commit abb1174e74acc0e2daafa58785cf2c7222ae5d69
Author: Alexander Kurtakov <akurtako at redhat.com>
Date:   Thu Nov 24 18:36:43 2011 +0200

    Build with maven 3.
    
    Adapt to current guidelines.

 javacc-maven-plugin.spec |   53 +++++++++++++---------------------------------
 1 files changed, 15 insertions(+), 38 deletions(-)
---
diff --git a/javacc-maven-plugin.spec b/javacc-maven-plugin.spec
index 93d7a17..fc144c7 100644
--- a/javacc-maven-plugin.spec
+++ b/javacc-maven-plugin.spec
@@ -1,6 +1,6 @@
 Name:           javacc-maven-plugin
 Version:        2.6
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        JavaCC Maven Plugin
 
 Group:          Development/Libraries
@@ -10,11 +10,10 @@ URL:            http://mojo.codehaus.org/javacc-maven-plugin/
 #tar cjf javacc-maven-plugin-2.6.tar.bz2 javacc-maven-plugin-2.6
 Source0:        javacc-maven-plugin-2.6.tar.bz2
 Patch0:         javacc-maven-plugin-pom.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch: noarch
 
-BuildRequires: maven2
+BuildRequires: maven
 BuildRequires: javacc >= 5.0
 BuildRequires: plexus-utils
 BuildRequires: maven-doxia
@@ -36,11 +35,9 @@ Requires: javacc >= 5.0
 Requires: plexus-utils
 Requires: jpackage-utils
 Requires: mojo-parent
-Requires(post): jpackage-utils
-Requires(postun): jpackage-utils
 
 %description
-Maven 2 Plugin for processing JavaCC grammar files.
+Maven Plugin for processing JavaCC grammar files.
 
 %package javadoc
 Group:          Documentation
@@ -56,58 +53,38 @@ API documentation for %{name}.
 %patch0 -b .sav
 
 %build
-export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
-mvn-jpp \
-        -e \
-        -Dmaven2.jpp.mode=true \
-        -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
-        package javadoc:javadoc
+mvn-rpmbuild package javadoc:javadoc
 
 %install
-rm -rf %{buildroot}
-
 # jars
 install -d -m 0755 %{buildroot}%{_javadir}
-install -m 644 target/%{name}-%{version}.jar   %{buildroot}%{_javadir}/%{name}-%{version}.jar
-
-(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; \
-    do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
-
-%add_to_maven_depmap org.codehaus.mojo javacc-maven-plugin %{version} JPP javacc-maven-plugin
+install -m 644 target/%{name}-%{version}.jar   %{buildroot}%{_javadir}/%{name}.jar
 
 # poms
-install -d -m 755 %{buildroot}%{_datadir}/maven2/poms
-install -pm 644 pom.xml \
-    %{buildroot}%{_datadir}/maven2/poms/JPP-%{name}.pom
+install -d -m 755 %{buildroot}%{_mavenpomdir}
+install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
 
-# 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}
-rm -rf target/site/api*
+%add_maven_depmap JPP-%{name}.pom %{name}.jar
 
-%post
-%update_maven_depmap
 
-%postun
-%update_maven_depmap
-
-%clean
-%{__rm} -rf %{buildroot}
+# javadoc
+install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
+cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
 
 %files
-%defattr(-,root,root,-)
 %{_javadir}/%{name}*
 %{_mavenpomdir}/*
 %{_mavendepmapfragdir}/*
 %doc src/main/resources/NOTICE
 
 %files javadoc
-%defattr(-,root,root,-)
-%{_javadocdir}/%{name}-%{version}
 %{_javadocdir}/%{name}
 
 %changelog
+* Thu Nov 24 2011 Alexander Kurtakov <akurtako at redhat.com> 2.6-8
+- Build with maven 3.
+- Adapt to current guidelines.
+
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.6-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild