From 83b218fd4e8d71c0b0d6e576c0caee83ae42478f Mon Sep 17 00:00:00 2001
From: Tomas Radej <tradej@redhat.com>
Date: May 23 2012 08:45:00 +0000
Subject: Updated to v2.4


---

diff --git a/.gitignore b/.gitignore
index 782383c..aca9039 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 maven-compiler-plugin-2.0.2.tar.xz
 /maven-compiler-plugin-2.3.2.tar.xz
+/maven-compiler-plugin-2.4.tar.xz
diff --git a/maven-compiler-plugin.spec b/maven-compiler-plugin.spec
index 6849539..66cdb78 100644
--- a/maven-compiler-plugin.spec
+++ b/maven-compiler-plugin.spec
@@ -1,13 +1,13 @@
 Name:           maven-compiler-plugin
-Version:        2.3.2
-Release:        5%{?dist}
+Version:        2.4
+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-2.3.2 maven-compiler-plugin-2.3.2
-#tar caf maven-compiler-plugin-2.3.2.tar.xz maven-compiler-plugin-2.3.2/
+#svn export http://svn.apache.org/repos/asf/maven/plugins/tags/maven-compiler-plugin-2.4 maven-compiler-plugin-2.4
+#tar caf maven-compiler-plugin-2.4.tar.xz maven-compiler-plugin-2.4/
 Source0:        %{name}-%{version}.tar.xz
 
 BuildArch: noarch
@@ -54,9 +54,7 @@ API documentation for %{name}.
 %setup -q #You may need to update this according to your Source0
 
 %build
-mvn-rpmbuild -e \
-        -Dmaven.test.failure.ignore=true \
-        install javadoc:javadoc
+mvn-rpmbuild install javadoc:aggregate -Dmaven.test.failure.ignore
 
 %install
 
@@ -76,11 +74,6 @@ install -pm 644 pom.xml \
 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} || :
-
 %files
 %{_javadir}/*
 %{_mavenpomdir}/*
@@ -90,6 +83,10 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
 %{_javadocdir}/%{name}
 
 %changelog
+* Wed May 23 2012 Tomas Radej <tradej@redhat.com> - 2.4-1
+- Updated to latest upstream version
+- Guidelines fixes + Removed RPM workaround
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.3.2-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
diff --git a/sources b/sources
index f40042a..0e517ed 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-670bb34438186667f4c4d42e0f6fd805  maven-compiler-plugin-2.3.2.tar.xz
+d1f8953cbf4b030952074ff36f638d66  maven-compiler-plugin-2.4.tar.xz