From d306ee556f392ce46103a0a7e1ad640e71c843cd Mon Sep 17 00:00:00 2001
From: cvsdist <cvsdist@fedoraproject.org>
Date: Sep 09 2004 06:27:48 +0000
Subject: auto-import changelog data from

    jakarta-commons-fileupload-1.0-1jpp_4rh.src.rpm
1.0-1jpp_4rh
- Fixes to build with servletapi5
1.0-1jpp_3rh
- Update dependency on servletapi

---

diff --git a/jakarta-commons-fileupload-servletapi5.patch b/jakarta-commons-fileupload-servletapi5.patch
new file mode 100644
index 0000000..aa3aa46
--- /dev/null
+++ b/jakarta-commons-fileupload-servletapi5.patch
@@ -0,0 +1,55 @@
+--- src/test/org/apache/commons/fileupload/MyHttpServletRequest.java.orig	2004-07-27 09:09:48.000000000 -0400
++++ src/test/org/apache/commons/fileupload/MyHttpServletRequest.java	2004-07-27 09:42:18.000000000 -0400
+@@ -366,6 +366,14 @@
+ 	}
+ 
+ 	/**
++	 * @see javax.servlet.ServletRequest#getLocalName()
++	 */
++	public String getLocalName()
++	{
++		return null;
++	}
++
++	/**
+ 	 * @see javax.servlet.ServletRequest#getServerPort()
+ 	 */
+ 	public int getServerPort()
+@@ -374,6 +382,22 @@
+ 	}
+ 
+ 	/**
++	 * @see javax.servlet.ServletRequest#getRemotePort()
++	 */
++	public int getRemotePort()
++	{
++		return 0;
++	}
++
++	/**
++	 * @see javax.servlet.ServletRequest#getLocalPort()
++	 */
++	public int getLocalPort()
++	{
++		return 0;
++	}
++
++	/**
+ 	 * @see javax.servlet.ServletRequest#getReader()
+ 	 */
+ 	public BufferedReader getReader() throws IOException
+@@ -390,6 +414,14 @@
+ 	}
+ 
+ 	/**
++	 * @see javax.servlet.ServletRequest#getLocalAddr()
++	 */
++	public String getLocalAddr()
++	{
++		return null;
++	}
++
++	/**
+ 	 * @see javax.servlet.ServletRequest#getRemoteHost()
+ 	 */
+ 	public String getRemoteHost()
diff --git a/jakarta-commons-fileupload.spec b/jakarta-commons-fileupload.spec
index d47eb7b..6240a33 100644
--- a/jakarta-commons-fileupload.spec
+++ b/jakarta-commons-fileupload.spec
@@ -2,7 +2,7 @@
 %define short_name      commons-%{base_name}
 %define name            jakarta-%{short_name}
 %define version         1.0
-%define release         1jpp_2rh
+%define release         1jpp_4rh
 %define section         free
 
 Name:           %{name}
@@ -16,10 +16,11 @@ Group:          Development/Libraries/Java
 Epoch:          1
 Source0:        http://www.apache.org/dist/jakarta/commons/fileupload/source/commons-fileupload-1.0-src.tar.gz
 Patch0:         %{name}-crosslink.patch
+Patch1:         %{name}-servletapi5.patch
 URL:            http://jakarta.apache.org/commons/fileupload/
 BuildRequires:  ant, servlet23, jpackage-utils >= 0:1.5, junit >= 0:3.8.1
-BuildRequires:  servletapi4-javadoc
-Requires:       servletapi4
+BuildRequires:  servletapi5-javadoc
+Requires:       servletapi5
 BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 Provides:       %{short_name}
@@ -44,17 +45,18 @@ Javadoc for %{name}.
 %prep
 %setup -q -n %{short_name}-%{version}
 %patch0 -p0
+%patch1 -p0
 
 # -----------------------------------------------------------------------------
 
 %build
-export CLASSPATH="$(build-classpath servletapi4 junit \
+export CLASSPATH="$(build-classpath servletapi5 junit \
 jakarta-commons-beanutils):$PWD/target/classes:$PWD/target/test-classes"
 
 ant \
   -Dbuild.sysclasspath=only \
   -Dfinal.name=%{name}-%{version} \
-  -Dservletapi.javadoc=%{_javadocdir}/servletapi4 \
+  -Dservletapi.javadoc=%{_javadocdir}/servletapi5 \
   dist
 
 # -----------------------------------------------------------------------------
@@ -102,6 +104,12 @@ fi
 # -----------------------------------------------------------------------------
 
 %changelog
+* Tue Jul 27 2004 Fernando Nasser <fnasser@redhat.com> 1:1.0-1jpp_4rh
+- Fixes to build with servletapi5
+
+* Fri Jul 18 2004 Fernando Nasser <fnasser@redhat.com> 1:1.0-1jpp_3rh
+- Update dependency on servletapi
+
 * Mon Mar  8 2004 Frank Ch. Eigler <fche@redhat.com> 1:1.0-1jpp_2rh
 - RH vacuuming part II