[java-sig-commits] [maven-compiler-plugin] Update to latest version (2.3.2)

[Stanislav Ochotnicky]

commit c8f6de893070486dcb9f8dc9171e7b7825ba9eef
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com&gt;
Date:   Thu Jan 20 15:51:43 2011 +0100

    Update to latest version (2.3.2)
    
    - Modifications according to new guidelines
    - Build with maven 3

 .gitignore                 |    1 +
 maven-compiler-plugin.spec |   58 ++++++++++++++++++++-----------------------
 sources                    |    2 +-
 3 files changed, 29 insertions(+), 32 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4ed2e22..782383c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 maven-compiler-plugin-2.0.2.tar.xz
+/maven-compiler-plugin-2.3.2.tar.xz
diff --git a/maven-compiler-plugin.spec b/maven-compiler-plugin.spec
index cbedfcb..70df8e6 100644
--- a/maven-compiler-plugin.spec
+++ b/maven-compiler-plugin.spec
@@ -1,33 +1,33 @@
 Name:           maven-compiler-plugin
-Version:        2.0.2
-Release:        2%{?dist}
+Version:        2.3.2
+Release:        1%{?dist}
 Summary:        Maven Compiler Plugin
 
 Group:          Development/Libraries
 License:        ASL 2.0
 URL:            http://maven.apache.org/plugins/maven-compiler-plugin
-#svn export
http://svn.apache.org/repos/asf/maven/plugins/tags/maven-compiler-plugin-...
maven-compiler-plugin-2.0.2
-#tar caf maven-compiler-plugin-2.0.2.tar.xz maven-compiler-plugin-2.0.2/
+#svn export
http://svn.apache.org/repos/asf/maven/plugins/tags/maven-compiler-plugin-...
maven-compiler-plugin-2.3.2
+#tar caf maven-compiler-plugin-2.3.2.tar.xz maven-compiler-plugin-2.3.2/
 Source0:        %{name}-%{version}.tar.xz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch: noarch
 
 BuildRequires: java-devel >= 1:1.6.0
 BuildRequires: maven2
-BuildRequires: maven2-plugin-plugin
-BuildRequires: maven2-plugin-compiler
-BuildRequires: maven2-plugin-jar
-BuildRequires: maven2-plugin-install
-BuildRequires: maven2-plugin-resources
+BuildRequires: maven-plugin-plugin
+BuildRequires: maven-compiler-plugin
+BuildRequires: maven-jar-plugin
+BuildRequires: maven-install-plugin
+BuildRequires: maven-resources-plugin
 BuildRequires: maven-javadoc-plugin
 BuildRequires: maven-surefire-maven-plugin
 BuildRequires: maven-surefire-provider-junit
 BuildRequires: maven-doxia-sitetools
 BuildRequires: maven-shared-plugin-testing-harness
-Requires: maven2
-Requires:       jpackage-utils
-Requires:       java
+
+Requires:      maven2
+Requires:      jpackage-utils
+Requires:      java
 Requires(post):       jpackage-utils
 Requires(postun):     jpackage-utils
 
@@ -50,23 +50,15 @@ API documentation for %{name}.
 %setup -q #You may need to update this according to your Source0
 
 %build
-export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
-mvn-jpp \
-        -e \
-        -Dmaven2.jpp.mode=true \
-        -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
+mvn-local -e \
         -Dmaven.test.skip=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-compiler-plugin %{version} JPP
maven-compiler-plugin
 
@@ -76,10 +68,13 @@ 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}
+
+%pre javadoc
+# workaround for rpm bug, can be removed in F-17
+[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
+rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
 
 %post
 %update_maven_depmap
@@ -87,9 +82,6 @@ rm -rf target/site/api*
 %postun
 %update_maven_depmap
 
-%clean
-%{__rm} -rf %{buildroot}
-
 %files
 %defattr(-,root,root,-)
 %{_javadir}/*
@@ -98,10 +90,14 @@ rm -rf target/site/api*
 
 %files javadoc
 %defattr(-,root,root,-)
-%{_javadocdir}/%{name}-%{version}
 %{_javadocdir}/%{name}
 
 %changelog
+* Wed Jan 19 2011 Stanislav Ochotnicky <sochotnicky(a)redhat.com&gt; - 2.3.2-1
+- Update to latest version (2.3.2)
+- Modifications according to new guidelines
+- Build with maven 3
+
 * Wed May 12 2010 Alexander Kurtakov <akurtako(a)redhat.com&gt; 2.0.2-2
 - Add missing requires.
 
diff --git a/sources b/sources
index 82beedd..f40042a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4091daf5084b3449cc165e5294971bab  maven-compiler-plugin-2.0.2.tar.xz
+670bb34438186667f4c4d42e0f6fd805  maven-compiler-plugin-2.3.2.tar.xz