[freemarker] - Add tomcat6-libs BR. - Use global instead of define.

[Alexander Kurtakov]

commit 2e383290c2b9a2cdbd8e03083d05e4143fa45fd1
Author: Alexander Kurtakov <akurtako at redhat.com>
Date:   Mon Sep 13 11:27:55 2010 +0300

    - Add tomcat6-libs BR.
    - Use global instead of define.

 freemarker.spec |   15 ++++++++++-----
 1 files changed, 10 insertions(+), 5 deletions(-)
---
diff --git a/freemarker.spec b/freemarker.spec
index c4aa5c1..472cd3f 100644
--- a/freemarker.spec
+++ b/freemarker.spec
@@ -1,15 +1,15 @@
 # Prevent brp-java-repack-jars from being run.
-%define __jar_repack %{nil}
+%global __jar_repack %{nil}
 
-%define checkForbiddenJARFiles F=`find -type f -iname '*.jar'`; [ ! -z "$F" ] && \
+%global checkForbiddenJARFiles F=`find -type f -iname '*.jar'`; [ ! -z "$F" ] && \
 echo "ERROR: Sources should not contain JAR files:" && echo "$F" && exit 1
 
-%define fm_compatible_ver 2.3
-%define fm_ver %{fm_compatible_ver}.13
+%global fm_compatible_ver 2.3
+%global fm_ver %{fm_compatible_ver}.13
 
 Name:           freemarker
 Version:        %{fm_ver}
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        A template engine
 
 Group:          Development/Libraries
@@ -50,6 +50,7 @@ BuildRequires: tomcat5-servlet-2.4-api >= 5.5
 BuildRequires: tomcat6-servlet-2.5-api >= 6.0
 BuildRequires: tomcat6-lib >= 6.0.16
 BuildRequires: xalan-j2 >= 2.7.0
+BuildRequires: tomcat6-lib
 
 Requires: java >= 1:1.6.0
 Requires: jpackage-utils
@@ -162,6 +163,10 @@ dos2unix -k docs/docs/api/package-list
 %{_javadocdir}/%{name}
 
 %changelog
+* Mon Sep 13 2010 Alexander Kurtakov <akurtako at redhat.com> 2.3.13-9
+- Add tomcat6-libs BR.
+- Use global instead of define.
+
 * Sat Feb 27 2010 Victor G. Vasilyev <victor.vasilyev at sun.com> 2.3.13-8
 - fix build patch for use of the javacc 5.0
 - patch for encoding