[maven2] - Remove buildnumber-maven-plugins deps now that is fixed. - Use new package names in BR/R. - Use gl

[Alexander Kurtakov]

commit a3c362c792892c53c1cd9f76de64a806249454a5
Author: Alexander Kurtakov <akurtako at redhat.com>
Date:   Wed Sep 1 12:14:37 2010 +0300

    - Remove buildnumber-maven-plugins deps now that is fixed.
    - Use new package names in BR/R.
    - Use global instead of define.

 maven2.spec |   45 ++++++++++++++++++---------------------------
 1 files changed, 18 insertions(+), 27 deletions(-)
---
diff --git a/maven2.spec b/maven2.spec
index 5f39aed..c863403 100644
--- a/maven2.spec
+++ b/maven2.spec
@@ -1,10 +1,9 @@
-
-%define bootstrap 0
-%define __jar_repack 0
+%global bootstrap 0
+%global __jar_repack 0
 
 Name:	    maven2
 Version:	2.2.1
-Release:	9%{?dist}
+Release:	10%{?dist}
 Summary:	Java project management and project comprehension tool
 
 Group:		Development/Build Tools
@@ -74,12 +73,12 @@ BuildRequires: buildnumber-maven-plugin
 BuildRequires: bsh
 BuildRequires: jsch
 BuildRequires: jakarta-commons-cli
-BuildRequires: jakarta-commons-codec
+BuildRequires: apache-commons-codec
 BuildRequires: jakarta-commons-collections
 BuildRequires: jakarta-commons-httpclient
-BuildRequires: jakarta-commons-io
-BuildRequires: jakarta-commons-lang
-BuildRequires: jakarta-commons-logging
+BuildRequires: apache-commons-io
+BuildRequires: apache-commons-lang
+BuildRequires: apache-commons-logging
 BuildRequires: easymock
 BuildRequires: junit
 BuildRequires: nekohtml
@@ -91,8 +90,7 @@ BuildRequires: maven-assembly-plugin
 BuildRequires: maven-doxia-tools
 BuildRequires: maven-enforcer-api
 BuildRequires: maven-enforcer-plugin
-BuildRequires: maven-enforcer-rule-api
-BuildRequires: maven2-plugin-shade
+BuildRequires: maven-shade-plugin
 BuildRequires: maven-clean-plugin
 BuildRequires: maven-compiler-plugin
 BuildRequires: maven-resources-plugin
@@ -115,7 +113,6 @@ BuildRequires: maven-scm
 BuildRequires: maven-wagon
 BuildRequires: modello
 BuildRequires: multithreadedtc
-BuildRequires: oro
 BuildRequires: plexus-active-collections
 BuildRequires: plexus-ant-factory
 BuildRequires: plexus-archiver
@@ -142,10 +139,6 @@ BuildRequires: jakarta-oro
 BuildRequires: regexp
 BuildRequires: slf4j
 BuildRequires: velocity
-
-# buildnumber-maven-plugin requirements
-BuildRequires: jna
-BuildRequires: svnkit
 %endif
 
 Requires: classworlds
@@ -158,12 +151,12 @@ Requires: backport-util-concurrent
 Requires: bsh
 Requires: jsch
 Requires: jakarta-commons-cli
-Requires: jakarta-commons-codec
+Requires: apache-commons-codec
 Requires: jakarta-commons-collections
 Requires: jakarta-commons-httpclient
-Requires: jakarta-commons-io
-Requires: jakarta-commons-lang
-Requires: jakarta-commons-logging
+Requires: apache-commons-io
+Requires: apache-commons-lang
+Requires: apache-commons-logging
 Requires: easymock
 Requires: junit
 Requires: nekohtml
@@ -174,7 +167,6 @@ Requires: maven-archiver
 Requires: maven-doxia-tools
 Requires: maven-enforcer-api
 Requires: maven-enforcer-plugin
-Requires: maven-enforcer-rule-api
 Requires: maven-plugin-testing-harness
 Requires: maven-shared-file-management
 Requires: maven-shared-common-artifact-filters
@@ -189,7 +181,7 @@ Requires: maven-scm
 Requires: maven-wagon
 Requires: modello
 Requires: multithreadedtc
-Requires: oro
+Requires: jakarta-oro
 Requires: plexus-active-collections
 Requires: plexus-ant-factory
 Requires: plexus-archiver
@@ -216,10 +208,6 @@ Requires: jakarta-oro
 Requires: regexp
 Requires: slf4j
 Requires: velocity
-
-# buildnumber-maven-plugin requirements
-Requires: jna
-Requires: svnkit
 %endif
 
 BuildArch: noarch
@@ -516,6 +504,11 @@ rm -rf $RPM_BUILD_ROOT
 %doc
 
 %changelog
+* Wed Sep 1 2010 Alexander Kurtakov <akurtako at redhat.com> 2.2.1-10
+- Remove buildnumber-maven-plugins deps now that is fixed.
+- Use new package names in BR/R.
+- Use global instead of define.
+
 * Fri Aug 27 2010 Stanislav Ochotnicky <sochotnicky at redhat.com> - 2.2.1-9
 - Remove failing tests after maven-surefire 2.6 update
 
@@ -552,5 +545,3 @@ rm -rf $RPM_BUILD_ROOT
 
 * Thu Nov 26 2009 Deepak Bhole <dbhole at redhat.com> - 0:2.2.1-1
 - Initial bootstrap build
-
-