[velocity: 2/3] Use new tomcat-servlet-api

[Stanislav Ochotnicky]

commit 5cb802a50689d8af8a114ca7f4a2e1b3e569704b
Author: Stanislav Ochotnicky <sochotnicky at redhat.com>
Date:   Tue Jun 5 14:19:55 2012 +0200

    Use new tomcat-servlet-api
    
    - Update to latest guidelines

 0002-Fix-servlet25-testcase.patch |   64 -------------------------------------
 velocity.spec                     |   40 ++++++++---------------
 2 files changed, 14 insertions(+), 90 deletions(-)
---
diff --git a/velocity.spec b/velocity.spec
index 4d69185..dd45cde 100644
--- a/velocity.spec
+++ b/velocity.spec
@@ -30,7 +30,7 @@
 
 Name:           velocity
 Version:        1.7
-Release:        3%{?dist}
+Release:        4%{?dist}
 Epoch:          0
 Summary:        Java-based template engine
 License:        ASL 2.0
@@ -38,14 +38,13 @@ URL:            http://velocity.apache.org/
 Source0:        http://www.apache.org/dist/%{name}/engine/%{version}/%{name}-%{version}.tar.gz
 Source1:        http://repo1.maven.org/maven2/org/apache/%{name}/%{name}/%{version}/%{name}-%{version}.pom
 Patch0:         0001-Remove-avalon-logkit.patch
-Patch1:         0002-Fix-servlet25-testcase.patch
 Patch2:         0003-Use-system-jars.patch
 Patch3:         0004-JDBC-41-compat.patch
 Group:          Development/Libraries
 Requires:       apache-commons-collections
 Requires:       apache-commons-logging
 Requires:       apache-commons-lang
-Requires:       tomcat6-servlet-2.5-api
+Requires:       servlet3
 Requires:       jakarta-oro
 Requires:       werken-xpath
 Requires:       junit
@@ -53,8 +52,6 @@ Requires:       hsqldb
 Requires:       jdom
 Requires:       bcel
 Requires:       log4j
-Requires(post): jpackage-utils
-Requires(postun): jpackage-utils
 
 BuildRequires:	werken-xpath
 BuildRequires:  ant
@@ -65,7 +62,7 @@ BuildRequires:  hsqldb
 BuildRequires:  apache-commons-collections
 BuildRequires:  apache-commons-logging
 BuildRequires:  apache-commons-lang
-BuildRequires:  tomcat6-servlet-2.5-api
+BuildRequires:  servlet3
 BuildRequires:  jakarta-oro
 BuildRequires:  jdom
 BuildRequires:  bcel
@@ -133,14 +130,14 @@ rm -f src/java/org/apache/velocity/runtime/log/AvalonLogChute.java
 rm -f src/java/org/apache/velocity/runtime/log/AvalonLogSystem.java
 rm -f src/java/org/apache/velocity/runtime/log/VelocityFormatter.java
 
+# need porting to new servlet API. We would just add a lot of empty functions
+rm  src/test/org/apache/velocity/test/VelocityServletTestCase.java
+
 cp %{SOURCE1} ./pom.xml
 
 # remove rest of avalon logkit refences
 %patch0 -p1
 
-# Fix test cases for servlet25
-%patch1 -p1
-
 # Use system jar files instead of downloading from net
 %patch2 -p1
 
@@ -154,7 +151,7 @@ antlr \
 apache-commons-collections \
 commons-lang \
 commons-logging \
-tomcat6-servlet-2.5-api \
+tomcat-servlet-api \
 junit \
 jakarta-oro \
 log4j \
@@ -189,42 +186,33 @@ cp -pr examples test %{buildroot}%{_datadir}/%{name}
 
 # Maven metadata
 install -pD -T -m 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
-%add_to_maven_depmap org.apache.velocity %{name} %{version} JPP %{name}
-%add_to_maven_depmap %{name} %{name} %{version} JPP %{name}
-
-# -----------------------------------------------------------------------------
 
-%post
-%update_maven_depmap
+%add_maven_depmap -a "%{name}:%{name}"
 
-%postun
-%update_maven_depmap
-
-# -----------------------------------------------------------------------------
 
 %files
-%defattr(-,root,root,-)
 %doc LICENSE NOTICE README.txt
 %{_javadir}/*.jar
-%{_mavendepmapfragdir}/*
-%{_mavenpomdir}/*
+%{_mavendepmapfragdir}/%{name}
+%{_mavenpomdir}/JPP-%{name}.pom
 
 %files manual
-%defattr(-,root,root,-)
 %doc LICENSE
 %doc docs/*
 
 %files javadoc
-%defattr(-,root,root,-)
 %doc LICENSE
 %{_javadocdir}/%{name}
 
 %files demo
-%defattr(-,root,root,-)
 %doc LICENSE
 %{_datadir}/%{name}
 
 %changelog
+* Tue Jun 05 2012 Stanislav Ochotnicky <sochotnicky at redhat.com> - 0:1.7-4
+- Use new tomcat-servlet-api
+- Update to latest guidelines
+
 * Fri Feb 17 2012 Deepak Bhole <dbhole at redhat.com> - 0:1.7-3
 - Resolved rhbz#791045
 - Added patch from Omaid Majid <omajid at redhat.com> to fix build with Java 7