rpms/jetty/F-11 jetty-OSGi-MANIFEST.MF, 1.2, 1.3 jetty.spec, 1.14, 1.15

[Jeff Johnston]

Author: jjohnstn

Update of /cvs/pkgs/rpms/jetty/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26216

Modified Files:
	jetty-OSGi-MANIFEST.MF jetty.spec 
Log Message:

* Tue May 19 2009 Jeff Johnston <jjohnstn at redhat.com> 5.1.15-2
- Update OSGI manifest file.

* Tue May 19 2009 Jeff Johnston <jjohnstn at redhat.com> 5.1.15-1
- Upgrade to 5.1.15 source tarball for Fedora.




Index: jetty-OSGi-MANIFEST.MF
===================================================================
RCS file: /cvs/pkgs/rpms/jetty/F-11/jetty-OSGi-MANIFEST.MF,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- jetty-OSGi-MANIFEST.MF	11 Jul 2008 14:23:39 -0000	1.2
+++ jetty-OSGi-MANIFEST.MF	19 May 2009 21:31:31 -0000	1.3
@@ -7,13 +7,13 @@ Import-Package: javax.net.ssl,javax.secu
  commons.logging;version="[1.0.0,2.0.0)",org.xml.sax,org.xml.sax.helpe
  rs
 Bundle-ManifestVersion: 2
-Export-Package: org.mortbay.html;version="5.1.14",org.mortbay.http;ver
- sion="5.1.14",org.mortbay.http.ajp;version="5.1.14",org.mortbay.http.
- handler;version="5.1.14",org.mortbay.http.nio;version="5.1.14",org.mo
- rtbay.jetty;version="5.1.14",org.mortbay.jetty.servlet;version="5.1.1
- 1",org.mortbay.jetty.win32;version="5.1.14",org.mortbay.log;version="
- 5.1.14",org.mortbay.servlet;version="5.1.14",org.mortbay.util;version
- ="5.1.14",org.mortbay.xml;version="5.1.14"
+Export-Package: org.mortbay.html;version="5.1.15",org.mortbay.http;ver
+ sion="5.1.15",org.mortbay.http.ajp;version="5.1.15",org.mortbay.http.
+ handler;version="5.1.15",org.mortbay.http.nio;version="5.1.15",org.mo
+ rtbay.jetty;version="5.1.15",org.mortbay.jetty.servlet;version="5.1.1
+ 5",org.mortbay.jetty.win32;version="5.1.15",org.mortbay.log;version="
+ 5.1.15",org.mortbay.servlet;version="5.1.15",org.mortbay.util;version
+ ="5.1.15",org.mortbay.xml;version="5.1.15"
 Bundle-Version: 5.1.14.v200806031611
 Bundle-SymbolicName: org.mortbay.jetty
 Bundle-Name: Jetty WebServer


Index: jetty.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jetty/F-11/jetty.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- jetty.spec	7 Apr 2009 16:44:41 -0000	1.14
+++ jetty.spec	19 May 2009 21:31:31 -0000	1.15
@@ -55,22 +55,22 @@
 %define demodir     %{jettylibdir}/demo
 
 Name:           jetty
-Version:        5.1.14
-Release:        3%{?dist}
+Version:        5.1.15
+Release:        2%{?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_x
 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/MX4JHttpAdap
 %patch2 -b .sav
 %patch3 -b .sav
 
-%patch4
 %patch5
 
 # Delete this Sun specific file.
@@ -607,13 +605,16 @@ fi
 %endif
 
 %changelog
-* Fri Apr 03 2009 Jeff Johnston <jjohnstn at redhat.com> 5.1.14-3
+* Tue May 19 2009 Jeff Johnston <jjohnstn at redhat.com> 5.1.15-2
+- Update OSGI manifest file.
+
+* Tue May 19 2009 Jeff Johnston <jjohnstn at redhat.com> 5.1.15-1
+- Upgrade to 5.1.15 source tarball for Fedora.
+
+* Fri Apr 22 2009 Jeff Johnston <jjohnstn at redhat.com> 5.1.14-3
 - Add %%{libdir} to files list.
 - Resolves #473585
 
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.1.14-2.10
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
 * Wed Feb 11 2009 Jeff Johnston <jjohnstn at redhat.com> 5.1.14-1.10
 - Rename jettyc back to .jettyrc.
 - Resolves #485012