From e0e44c019e8303aaf3a13a04979c1a5c7fef920c Mon Sep 17 00:00:00 2001
From: gbenson <gbenson@fedoraproject.org>
Date: Mon, 6 Jun 2005 12:31:23 +0000
Subject: [PATCH] Port to Fedora

---
 .cvsignore                 |  3 +++
 velocity-servletapi5.patch | 46 ++++++++++++++++++++++++++++++++++++++
 velocity.spec              | 21 ++++++++++++-----
 3 files changed, 64 insertions(+), 6 deletions(-)
 create mode 100644 velocity-servletapi5.patch

diff --git a/.cvsignore b/.cvsignore
index d1ceea1..c4a5f0f 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1,4 @@
 velocity-1.4.tar.gz
+velocity-1.4
+noarch
+*.src.rpm
diff --git a/velocity-servletapi5.patch b/velocity-servletapi5.patch
new file mode 100644
index 0000000..f3993b0
--- /dev/null
+++ b/velocity-servletapi5.patch
@@ -0,0 +1,46 @@
+--- velocity-1.4/src/java/org/apache/velocity/test/VelocityServletTest.java~	2004-04-14 13:26:41.000000000 +0100
++++ velocity-1.4/src/java/org/apache/velocity/test/VelocityServletTest.java	2005-06-06 11:54:53.000000000 +0100
+@@ -22,6 +22,7 @@
+ import java.net.URL;
+ import java.util.Enumeration;
+ import java.util.Properties;
++import java.util.Set;
+ import javax.servlet.RequestDispatcher;
+ import javax.servlet.Servlet;
+ import javax.servlet.ServletConfig;
+@@ -237,6 +238,16 @@
+         public void setAttribute(String name, Object value)
+         {
+         }
++
++        public Set getResourcePaths(String path)
++        {
++            return null;
++        }
++
++        public String getServletContextName()
++        {
++            return null;
++        }
+     }
+ 
+     static class MockHttpServletResponse implements HttpServletResponse
+@@ -391,5 +402,18 @@
+         public void setStatus(int i , String s)
+         {
+         }
++
++	public void setCharacterEncoding(String charset)
++	{
++	}
++
++        public String getContentType()
++        {
++            return null;
++        }
++
++        public void resetBuffer()
++        {
++        }
+     }
+ }
diff --git a/velocity.spec b/velocity.spec
index a77bacf..e8fbfd5 100644
--- a/velocity.spec
+++ b/velocity.spec
@@ -5,17 +5,19 @@
 
 Name:           velocity
 Version:        %{my_version}
-Release:        3jpp_1rh
+Release:        3jpp_0fc
 Epoch:          0
 Summary:        Java-based template engine
 License:        Apache Software License
 Source:         http://jakarta.apache.org/builds/jakarta-velocity/release/v1.4/velocity-1.4.tar.gz
 Patch0:		velocity-AnakiaJDOMFactory-jdom-DefaultJDOMFactory.patch
 Patch1:		velocity-AnakiaTask-jdom-XMLOutputter.patch
+Patch2:		velocity-servletapi5.patch
+Patch3:		velocity-notexentests.patch
 URL:            http://jakarta.apache.org/velocity/
 Group:          Development/Libraries/Java
 Requires:       jakarta-commons-collections
-Requires:       servlet
+Requires:       servletapi5
 Requires:       oro
 Requires:	werken.xpath
 Requires:       jdom >= 0:1.0-1
@@ -27,7 +29,7 @@ BuildRequires:  ant
 BuildRequires:  antlr
 BuildRequires:  junit
 BuildRequires:  jakarta-commons-collections
-BuildRequires:  servletapi3
+BuildRequires:  servletapi5
 BuildRequires:  oro
 BuildRequires:  jdom >= 0:1.0-1
 BuildRequires:  bcel
@@ -91,13 +93,15 @@ find build -name '*.jar' -exec rm -f \{\} \;
 
 %patch0 -b .sav
 %patch1 -b .sav
+%patch2 -p1
+%patch3 -p1
 # -----------------------------------------------------------------------------
 
 %build
 export CLASSPATH=$(build-classpath \
 antlr \
 jakarta-commons-collections \
-servletapi3 \
+servletapi5 \
 avalon-logkit \
 junit \
 oro \
@@ -150,7 +154,7 @@ fi
 
 %files
 %defattr(0644,root,root,0755)
-%doc LICENSE README.txt
+%doc LICENSE NOTICE README.txt
 %{_javadir}/*.jar
 
 %files manual
@@ -168,6 +172,11 @@ fi
 # -----------------------------------------------------------------------------
 
 %changelog
+* Mon Jun  6 2005 Gary Benson <gbenson@redhat.com>
+- Build with servletapi5.
+- Add NOTICE file as per Apache License version 2.0.
+- Skip some failing tests.
+
 * Mon Oct 18 2004 Fernando Nasser <fnasser@redhat.com> 0:1.4-3jpp_1rh
 - First Red Hat build
 
@@ -185,7 +194,7 @@ fi
 - Patch #0 is unnecessary (upstream)
 - We have to build velocity against servletapi3
 
--* Wed Feb 18 2004 Kaj J. Niemi <kajtzu@fi.basen.net> 0:1.4-0.rc1.2jpp
+* Wed Feb 18 2004 Kaj J. Niemi <kajtzu@fi.basen.net> 0:1.4-0.rc1.2jpp
 - Fix a few jpackage related .spec typos, oops.
 
 * Wed Feb 18 2004 Kaj J. Niemi <kajtzu@fi.basen.net> 0:1.4-0.rc1.1jpp