From 1948efb9fbf49dd7929343339bc1c6c57e39c400 Mon Sep 17 00:00:00 2001
From: Jeff Johnston <jjohnstn@fedoraproject.org>
Date: May 19 2009 20:25:26 +0000
Subject: - Upgrade to 5.1.15 source tarball for Fedora.


---

diff --git a/.cvsignore b/.cvsignore
index 5e1ca9b..ca4ce2a 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,3 @@
 jetty-5.1.12.fedora.zip
 jetty-5.1.14.fedora.tgz
+jetty-5.1.15.fedora.tgz
diff --git a/jetty.spec b/jetty.spec
index 9dfabbb..484dc6f 100644
--- a/jetty.spec
+++ b/jetty.spec
@@ -55,22 +55,22 @@
 %define demodir     %{jettylibdir}/demo
 
 Name:           jetty
-Version:        5.1.14
-Release:        3%{?dist}
+Version:        5.1.15
+Release:        1%{?dist}
 Summary:        The Jetty Webserver and Servlet Container
 
 Group:          Applications/Internet
 License:        ASL 2.0
 URL:            http://jetty.mortbay.org/jetty/
 # Following source tarball was originally taken from the following location:
-# http://www.ibiblio.org/maven/jetty/jetty-5.1.x/jetty-5.1.14.tgz
+# http://dist.codehaus.org/jetty/jetty-5.1.x/jetty-5.1.15.tgz
 # The tarball was modified by removing all jars and BCLA licenses.
-# tar -xzf jetty-5.1.14.tgz
-# pushd jetty-5.1.14
+# tar -xzf jetty-5.1.15.tgz
+# pushd jetty-5.1.15
 # find . -name *.jar -exec rm {} \;
 # rm ./etc/LICENSE.javax.xml.html ./etc/LICENSE.jsse.txt
 # popd
-# tar -czf jetty-5.1.14.fedora.tgz jetty-5.1.14/*
+# tar -czf jetty-5.1.15.fedora.tgz jetty-5.1.15/*
 Source0:        %{jettyname}-%{version}.fedora.tgz
 Source1:        jetty.script
 Source2:        jetty.init
@@ -80,7 +80,6 @@ Patch0:         jetty-extra-j2ee-build_xml.patch
 Patch1:         jetty-PostFileFilter.patch
 Patch2:         jetty-libgcj-bad-serialization.patch
 Patch3:         jetty-TestRFC2616-libgcj-bad-date-parser.patch
-Patch4:		jetty-CERT438616-CERT237888-CERT21284.patch
 Patch5:		jetty-unix.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -257,7 +256,6 @@ rm src/org/mortbay/util/jmx/MX4JHttpAdaptor.java
 %patch2 -b .sav
 %patch3 -b .sav
 
-%patch4
 %patch5
 
 # Delete this Sun specific file.
@@ -607,6 +605,9 @@ fi
 %endif
 
 %changelog
+* Tue May 19 2009 Jeff Johnston <jjohnstn@redhat.com> 5.1.15-1
+- Upgrade to 5.1.15 source tarball for Fedora.
+
 * Fri Apr 22 2009 Jeff Johnston <jjohnstn@redhat.com> 5.1.14-3
 - Add %%{libdir} to files list.
 - Resolves #473585
diff --git a/sources b/sources
index 5d2995d..36eda72 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-04dcaaa5407462cea9c514b7f7aabff7  jetty-5.1.14.fedora.tgz
+09d5e3204f5c74efcd3ae9330f92838b  jetty-5.1.15.fedora.tgz