From 50c0753e48ea0af930191926faa9d2386360f47d Mon Sep 17 00:00:00 2001
From: Alexander Kurtakov <akurtako@redhat.com>
Date: Jun 08 2011 22:47:55 +0000
Subject: Build with maven 3.x.


Use upstream source.
Guidelines fixes.

---

diff --git a/.gitignore b/.gitignore
index 2ed3b91..0cb14e5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 maven-invoker-plugin-1.5.tgz
+/maven-invoker-plugin-1.5-source-release.zip
diff --git a/maven-invoker-plugin.spec b/maven-invoker-plugin.spec
index 963eb04..9b43e4f 100644
--- a/maven-invoker-plugin.spec
+++ b/maven-invoker-plugin.spec
@@ -1,15 +1,12 @@
 Name:           maven-invoker-plugin
 Version:        1.5
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Maven Invoker Plugin
 
 Group:          Development/Libraries
 License:        ASL 2.0
 URL:            http://maven.apache.org/plugins/maven-invoker-plugin/
-# svn export http://svn.apache.org/repos/asf/maven/plugins/tags/maven-invoker-plugin-1.5 maven-invoker-plugin    
-# tar czf maven-invoker-plugin-1.5.tgz maven-invoker-plugin
-Source0:        maven-invoker-plugin-1.5.tgz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Source0:        http://repo2.maven.org/maven2/org/apache/maven/plugins/%{name}/%{version}/%{name}-%{version}-source-release.zip
 
 BuildArch: noarch
 
@@ -17,7 +14,7 @@ BuildArch: noarch
 BuildRequires: jpackage-utils
 BuildRequires: java-devel >= 1:1.6.0
 # Maven and its dependencies
-BuildRequires: maven2
+BuildRequires: maven
 BuildRequires: maven-resources-plugin
 BuildRequires: maven-plugin-plugin
 BuildRequires: maven-compiler-plugin
@@ -27,7 +24,7 @@ BuildRequires: maven-doxia
 BuildRequires: maven-doxia-tools
 BuildRequires: maven-doxia-sitetools
 BuildRequires: maven-surefire-provider-junit
-BuildRequires: maven-surefire-maven-plugin
+BuildRequires: maven-surefire-plugin
 BuildRequires: maven-plugin-cobertura
 BuildRequires: maven-javadoc-plugin
 BuildRequires: maven-shared-invoker
@@ -36,7 +33,7 @@ BuildRequires: maven-shared-invoker
 BuildRequires: groovy
 
 Requires: java
-Requires: maven2
+Requires: maven
 Requires: groovy
 Requires: jpackage-utils
 Requires: maven-shared-invoker
@@ -63,26 +60,17 @@ Requires:       jpackage-utils
 API documentation for %{name}.
 
 %prep
-%setup -q -n %{name}
+%setup -q 
 
 %build
-export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
-mvn-jpp \
-        -e \
-        -Dmaven.test.skip=true \
-        -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 org.apache.maven.plugins maven-invoker-plugin %{version} JPP maven-invoker-plugin
 
@@ -92,10 +80,8 @@ 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
@@ -103,21 +89,20 @@ rm -rf target/site/api*
 %postun
 %update_maven_depmap
 
-%clean
-rm -rf %{buildroot}
-
 %files
-%defattr(-,root,root,-)
 %{_javadir}/*
 %{_mavenpomdir}/*
 %{_mavendepmapfragdir}/*
 
 %files javadoc
-%defattr(-,root,root,-)
-%{_javadocdir}/%{name}-%{version}
 %{_javadocdir}/%{name}
 
 %changelog
+* Thu Jun 9 2011 Alexander Kurtakov <akurtako@redhat.com> 1.5-5
+- Build with maven 3.x.
+- Use upstream source.
+- Guidelines fixes.
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.5-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/sources b/sources
index 3df04d5..a779567 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f9f19d98fbd1e94454218c0d5b8af50a  maven-invoker-plugin-1.5.tgz
+5df332e1360956f46c3f42767dd78cd4  maven-invoker-plugin-1.5-source-release.zip