From 7fe27bf8e4adbe67d24ead136fd3b5b6de53bc3f Mon Sep 17 00:00:00 2001
From: Alexander Kurtakov <akurtakov@fedoraproject.org>
Date: Mon, 7 Jun 2010 09:46:36 +0000
Subject: [PATCH] - Fix BR/R for jakarta-commons-rename.

---
 velocity.spec | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/velocity.spec b/velocity.spec
index b37099c..0ca0c03 100644
--- a/velocity.spec
+++ b/velocity.spec
@@ -28,12 +28,9 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-%define section free
-
-
 Name:           velocity
 Version:        1.6.3
-Release:        3%{?dist}
+Release:        4%{?dist}
 Epoch:          0
 Summary:        Java-based template engine
 License:        ASL 2.0
@@ -46,8 +43,8 @@ Patch3:		velocity-cleanup-pom.patch
 URL:            http://velocity.apache.org/
 Group:          Development/Libraries
 Requires:       jakarta-commons-collections
-Requires:       jakarta-commons-logging
-Requires:       jakarta-commons-lang
+Requires:       apache-commons-logging
+Requires:       apache-commons-lang
 # Use servletapi5 instead of servletapi3
 Requires:       servletapi5
 Requires:       oro
@@ -68,8 +65,8 @@ BuildRequires:  junit
 BuildRequires:	ant-junit
 BuildRequires:  hsqldb
 BuildRequires:  jakarta-commons-collections
-BuildRequires:  jakarta-commons-logging
-BuildRequires:  jakarta-commons-lang
+BuildRequires:  apache-commons-logging
+BuildRequires:  apache-commons-lang
 # Use servletapi5 instead of servletapi3
 BuildRequires:  servletapi5
 BuildRequires:  oro
@@ -113,6 +110,7 @@ Documentation for %{name}.
 %package        javadoc
 Summary:        Javadoc for %{name}
 Group:          Documentation
+Requires:       jpackage-utils
 
 %description    javadoc
 Javadoc for %{name}.
@@ -152,8 +150,8 @@ cp %{SOURCE1} ./pom.xml
 export CLASSPATH=$(build-classpath \
 antlr \
 jakarta-commons-collections \
-jakarta-commons-lang \
-jakarta-commons-logging \
+commons-lang \
+commons-logging \
 servletapi5 \
 junit \
 oro \
@@ -224,6 +222,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/%{name}
 
 %changelog
+* Mon Jun 7 2010 Alexander Kurtakov <akurtako@redhat.com> 0:1.6.3-4
+- Fix BR/R for jakarta-commons-rename.
+
 * Sat Feb 13 2010 Mary Ellen Foster <mefoster at gmail.com> 0:1.6.3-3
 - Get (Build)Requires right