[maven] Look into maven.repo.local first to handle corner-case packages (#865599)

[Stanislav Ochotnicky]

commit a7133ac4fae7f347446e95ee6432e3735f0e7e16
Author: Stanislav Ochotnicky <sochotnicky at redhat.com>
Date:   Thu Oct 18 15:55:29 2012 +0200

    Look into maven.repo.local first to handle corner-case packages (#865599)
    
    - Finish handling of compatibility packages

 maven.spec |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)
---
diff --git a/maven.spec b/maven.spec
index 82a94c8..e0a13c4 100644
--- a/maven.spec
+++ b/maven.spec
@@ -2,7 +2,7 @@
 
 Name:           maven
 Version:        3.0.4
-Release:        11%{?dist}
+Release:        12%{?dist}
 Summary:        Java project management and project comprehension tool
 
 Group:          Development/Tools
@@ -165,9 +165,10 @@ sed -i -e s:'-classpath "${M2_HOME}"/boot/plexus-classworlds-\*.jar':'-classpath
 popd
 
 # Disable animal-sniffer on RHEL
-if [ %{?rhel} ]; then
-    %pom_remove_plugin :animal-sniffer-maven-plugin
-fi
+# Temporarily disabled for fedora to solve asm & asm4 clashing on classpath
+#if [ %{?rhel} ]; then
+%pom_remove_plugin :animal-sniffer-maven-plugin
+#fi
 
 %build
 mvn-rpmbuild -e install javadoc:aggregate
@@ -376,6 +377,11 @@ ln -sf `rpm --eval '%%{_jnidir}'` %{_datadir}/%{name}/repository-jni/JPP
 
 
 %changelog
+* Thu Oct 18 2012 Stanislav Ochotnicky <sochotnicky at redhat.com> - 3.0.4-12
+- Look into maven.repo.local first to handle corner-case packages (#865599)
+- Finish handling of compatibility packages
+- Disable animal-sniffer temporarily in Fedora as well
+
 * Mon Aug 27 2012 Mikolaj Izdebski <mizdebsk at redhat.com> - 3.0.4-11
 - Disable animal-sniffer on RHEL