[jarjar] Do not require maven2.

[Alexander Kurtakov]

commit 42f8575c5da67d7477298d65a27f721ad70e5a70
Author: Alexander Kurtakov <akurtakov at gmail.com>
Date:   Fri Jun 17 05:30:38 2011 +0300

    Do not require maven2.

 jarjar.spec |   39 ++++++++++++++++-----------------------
 1 files changed, 16 insertions(+), 23 deletions(-)
---
diff --git a/jarjar.spec b/jarjar.spec
index 3e911f6..d090051 100644
--- a/jarjar.spec
+++ b/jarjar.spec
@@ -30,7 +30,7 @@
 
 Name:           jarjar
 Version:        1.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Jar Jar Links
 License:        ASL 2.0
 URL:            http://code.google.com/p/jarjar/
@@ -49,7 +49,7 @@ BuildRequires:  jpackage-utils >= 0:1.7.2
 BuildRequires:  junit
 BuildRequires:  objectweb-asm
 BuildRequires:  gnu-regexp
-BuildRequires:  maven2
+BuildRequires:  maven
 Requires:       objectweb-asm
 Requires:       gnu-regexp
 Requires:       jpackage-utils >= 0:1.7.2
@@ -70,13 +70,15 @@ You can avoid problems where your library depends on a specific
 version of a library, which may conflict with the dependencies of 
 another library.
 
-%package maven2-plugin
-Summary:        Maven2 plugin for %{name}
+%package maven-plugin
+Summary:        Maven plugin for %{name}
 Group:          Development/Tools
-Requires:       maven2
+Requires:       maven
 Requires:       %{name} = %{version}-%{release}
+Obsoletes: %{name}-maven2-plugin <= 1.0
+Provides: %{name}-maven2-plugin = %{version}-%{release}
 
-%description maven2-plugin
+%description maven-plugin
 %{summary}.
 
 %package javadoc
@@ -99,19 +101,13 @@ pushd lib
 ln -sf $(build-classpath gnu-regexp)
 ln -sf $(build-classpath objectweb-asm/asm-3.1) asm-3.1.jar
 ln -sf $(build-classpath objectweb-asm/asm-commons-3.1) asm-commons-3.1.jar
-%if 0%{?fedora} <= 13
-ln -sf $(build-classpath maven2/plugin-api) maven-plugin-api.jar
-%else
-ln -sf $(build-classpath maven2/maven-plugin-api) maven-plugin-api.jar
-%endif
+ln -sf $(build-classpath maven/maven-plugin-api) maven-plugin-api.jar
 popd
 export OPT_JAR_LIST="ant/ant-junit junit"
 export CLASSPATH=$(build-classpath ant)
 ant jar jar-util javadoc mojo test
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
 # jars
 mkdir -p $RPM_BUILD_ROOT%{_javadir}
 
@@ -120,7 +116,7 @@ install -m 644 dist/%{name}-%{version}.jar \
 install -m 644 dist/%{name}-util-%{version}.jar \
   $RPM_BUILD_ROOT%{_javadir}/%{name}-util.jar
 install -m 644 dist/%{name}-plugin-%{version}.jar \
-  $RPM_BUILD_ROOT%{_javadir}/%{name}-maven2-plugin.jar
+  $RPM_BUILD_ROOT%{_javadir}/%{name}-maven-plugin.jar
 
 %add_to_maven_depmap jarjar           %{name} %{version} JPP %{name}
 %add_to_maven_depmap tonic            %{name} %{version} JPP %{name}
@@ -146,9 +142,6 @@ install -pD -T -m 644 maven/pom.xml \
 mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 cp -pr dist/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %post
 %update_maven_depmap
 
@@ -161,24 +154,24 @@ rm -rf $RPM_BUILD_ROOT
 rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
 
 %files
-%defattr(-,root,root,-)
 %doc COPYING
 %{_javadir}/%{name}.jar
 %{_javadir}/%{name}-util.jar
 %{_mavenpomdir}/JPP-%{name}.pom
 %{_mavenpomdir}/JPP-%{name}-util.pom
-%config(noreplace) %{_mavendepmapfragdir}/*
+%{_mavendepmapfragdir}/*
 
-%files maven2-plugin
-%defattr(-,root,root,-)
+%files maven-plugin
 %{_mavenpomdir}/JPP-%{name}-plugin.pom
-%{_javadir}/%{name}-maven2-plugin.jar
+%{_javadir}/%{name}-maven-plugin.jar
 
 %files javadoc
-%defattr(-,root,root,-)
 %{_javadocdir}/%{name}
 
 %changelog
+* Fri Jun 17 2011 Alexander Kurtakov <akurtako at redhat.com> 1.0-4
+- Do not require maven2.
+
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild