[java-sig-commits] [maven-jflex-plugin] Build with maven 3.x

[Alexander Kurtakov]

commit 7aed9c0fb67345523cffddd118fa0bc5f55cea96
Author: Alexander Kurtakov <akurtakov(a)gmail.com&gt;
Date:   Fri Jun 17 02:46:18 2011 +0300

    Build with maven 3.x

 maven-jflex-plugin.spec |   46 ++++++++++++++--------------------------------
 1 files changed, 14 insertions(+), 32 deletions(-)
---
diff --git a/maven-jflex-plugin.spec b/maven-jflex-plugin.spec
index 4db6b2d..49e719e 100644
--- a/maven-jflex-plugin.spec
+++ b/maven-jflex-plugin.spec
@@ -1,6 +1,6 @@
 Name:           maven-jflex-plugin
 Version:        1.4.3
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Maven JFlex Plugin
 
 Group:          Development/Libraries
@@ -10,13 +10,12 @@ URL:            http://jflex.sourceforge.net/maven-jflex-plugin/
 # svn export
http://jflex.svn.sourceforge.net/svnroot/jflex/tags/release_1_4_3/maven-j...
maven-jflex-plugin-1.4.3
 # tar cjf maven-jflex-plugin-1.4.3.tar.bz2 maven-jflex-plugin-1.4.3/
 Source0:        maven-jflex-plugin-1.4.3.tar.bz2
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch: noarch
 
 BuildRequires: jflex
 BuildRequires: apache-commons-io
-BuildRequires: maven2
+BuildRequires: maven
 BuildRequires: maven-plugin-plugin
 BuildRequires: maven-resources-plugin
 BuildRequires: maven-compiler-plugin
@@ -29,7 +28,7 @@ BuildRequires: maven-doxia-sitetools
 BuildRequires: maven-plugin-testing-harness
 Requires: jflex
 Requires: apache-commons-io
-Requires: maven2
+Requires: maven
 
 %description
 This is a Maven 2 plugin to generate a parser in Java code from
@@ -39,6 +38,7 @@ a Lexer definition, using Jflex.de.
 %package javadoc
 Group:          Documentation
 Summary:        Javadoc for %{name}
+Requires:       jpackage-utils
 
 %description javadoc
 API documentation for %{name}.
@@ -47,40 +47,25 @@ API documentation for %{name}.
 %prep
 %setup -q 
 
-mkdir external_repo
-ln -s %{_javadir} external_repo/JPP
-
 %build
-export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
-mvn-jpp \
-        -e \
-        -Dmaven2.jpp.mode=true \
-        -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
+mvn-rpmbuild \
         -Dmaven.test.failure.ignore=true \
         install 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)
+install -m 644 target/%{name}-%{version}.jar   %{buildroot}%{_javadir}/%{name}.jar
 
 %add_to_maven_depmap de.jflex %{name} %{version} JPP %{name}
 
 # 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*
+install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
+cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
 
 %post
 %update_maven_depmap
@@ -88,21 +73,18 @@ rm -rf target/site/api*
 %postun
 %update_maven_depmap
 
-%clean
-%{__rm} -rf %{buildroot}
-
 %files
-%defattr(-,root,root,-)
 %{_javadir}/%{name}*.jar
-%{_datadir}/maven2/poms/*
+%{_mavenpomdir}/*
 %{_mavendepmapfragdir}/*
 
 %files javadoc
-%defattr(-,root,root,-)
-%{_javadocdir}/%{name}-%{version}
 %{_javadocdir}/%{name}
 
 %changelog
+* Fri Jun 17 2011 Alexander Kurtakov <akurtako(a)redhat.com&gt; 1.4.3-5
+- Build with maven 3.x.
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org&gt; -
1.4.3-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild