From 3652da78293d8c5c1ba37fb1f9c26c8f5f14c395 Mon Sep 17 00:00:00 2001
From: Alexander Kurtakov <akurtakov@fedoraproject.org>
Date: Mon, 1 Mar 2010 14:44:21 +0000
Subject: [PATCH] Update to 6.0.24.

---
 .cvsignore                              |  1 +
 jsp-api-OSGi-MANIFEST.MF                | 13 +++++++++++++
 sources                                 |  2 +-
 tomcat6-6.0-bootstrap-MANIFEST.MF.patch |  7 ++++---
 tomcat6.spec                            | 15 ++++++++++++---
 5 files changed, 31 insertions(+), 7 deletions(-)
 create mode 100644 jsp-api-OSGi-MANIFEST.MF

diff --git a/.cvsignore b/.cvsignore
index 0d3513f..ddf7ad7 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,3 @@
 apache-tomcat-6.0.18-src.tar.gz
 apache-tomcat-6.0.20-src.tar.gz
+apache-tomcat-6.0.24-src.tar.gz
diff --git a/jsp-api-OSGi-MANIFEST.MF b/jsp-api-OSGi-MANIFEST.MF
new file mode 100644
index 0000000..d5ecf7e
--- /dev/null
+++ b/jsp-api-OSGi-MANIFEST.MF
@@ -0,0 +1,13 @@
+Manifest-Version: 1.0
+Bundle-Vendor: %bundleProvider
+Bundle-Localization: plugin
+Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,J2SE-1.3
+Bundle-Name: %bundleName
+Bundle-SymbolicName: javax.servlet.jsp
+Export-Package: javax.servlet.jsp; version=2.0,javax.servlet.jsp.el; v
+ ersion=2.0,javax.servlet.jsp.resources; version=2.0,javax.servlet.jsp
+ .tagext; version=2.0
+Bundle-Version: 2.0.0.v200806031607
+Bundle-ManifestVersion: 2
+Import-Package: javax.servlet; version=2.4,javax.servlet.http; version
+ =2.4,javax.servlet.resources; version=2.4
diff --git a/sources b/sources
index 2621202..27e80a8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-44f49e7e14028b6a53c3c346bd18c72f  apache-tomcat-6.0.20-src.tar.gz
+543218290008e0dd6a329f69136973ca  apache-tomcat-6.0.24-src.tar.gz
diff --git a/tomcat6-6.0-bootstrap-MANIFEST.MF.patch b/tomcat6-6.0-bootstrap-MANIFEST.MF.patch
index 7b278dc..85ee302 100644
--- a/tomcat6-6.0-bootstrap-MANIFEST.MF.patch
+++ b/tomcat6-6.0-bootstrap-MANIFEST.MF.patch
@@ -1,8 +1,9 @@
---- res/bootstrap.jar.manifest.orig	2007-06-21 11:02:18.000000000 -0400
-+++ res/bootstrap.jar.manifest	2007-06-21 11:02:26.000000000 -0400
+--- res/META-INF/bootstrap.jar.manifest.orig	2010-01-19 15:43:41.000000000 +0200
++++ res/META-INF/bootstrap.jar.manifest	2010-03-01 12:42:57.993559599 +0200
 @@ -1,5 +1,4 @@
  Manifest-Version: 1.0
  Main-Class: org.apache.catalina.startup.Bootstrap
--Class-Path: commons-daemon.jar tomcat-juli.jar tomcat-coyote.jar
+-Class-Path: commons-daemon.jar tomcat-juli.jar
  Specification-Title: Catalina
  Specification-Version: 6.0
+\ No newline at end of file
diff --git a/tomcat6.spec b/tomcat6.spec
index df04f65..fe474e0 100644
--- a/tomcat6.spec
+++ b/tomcat6.spec
@@ -33,7 +33,7 @@
 %define jspspec 2.1
 %define major_version 6
 %define minor_version 0
-%define micro_version 20
+%define micro_version 24
 %define packdname apache-tomcat-%{version}-src
 %define servletspec 2.5
 %define tcuid 91
@@ -54,7 +54,7 @@
 Name: tomcat6
 Epoch: 0
 Version: %{major_version}.%{minor_version}.%{micro_version}
-Release: 2%{?dist}
+Release: 1%{?dist}
 Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API
 
 Group: Networking/Daemons
@@ -69,6 +69,7 @@ Source5: %{name}-%{major_version}.%{minor_version}.logrotate
 Source6: %{name}-%{major_version}.%{minor_version}-digest.script
 Source7: %{name}-%{major_version}.%{minor_version}-tool-wrapper.script
 Source8: servlet-api-OSGi-MANIFEST.MF
+Source9: jsp-api-OSGi-MANIFEST.MF
 Patch0: %{name}-%{major_version}.%{minor_version}-bootstrap-MANIFEST.MF.patch
 Patch1: %{name}-%{major_version}.%{minor_version}-tomcat-users-webapp.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -230,6 +231,9 @@ mkdir -p META-INF
 cp -p %{SOURCE8} META-INF/MANIFEST.MF
 touch META-INF/MANIFEST.MF
 zip -u %{packdname}/output/build/lib/servlet-api.jar META-INF/MANIFEST.MF
+cp -p %{SOURCE9} META-INF/MANIFEST.MF
+touch META-INF/MANIFEST.MF
+zip -u %{packdname}/output/build/lib/jsp-api.jar META-INF/MANIFEST.MF
 
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
@@ -355,7 +359,9 @@ popd
     %{_javadir}/%{name}-servlet-%{servletspec}-api.jar 20500
 
 %post webapps
-%{_bindir}/build-jar-repository %{appdir}/examples/WEB-INF/lib \
+# need to use -p here with b-j-r otherwise the examples webapp fails to
+# load with a java.io.IOException
+%{_bindir}/build-jar-repository -p %{appdir}/examples/WEB-INF/lib \
     taglibs-core.jar taglibs-standard.jar 2>&1
 
 %preun
@@ -446,6 +452,9 @@ fi
 %{appdir}/sample
 
 %changelog
+* Mon Mar 1 2010 Alexander Kurtakov <akurtako@redhat.com> 0:6.0.24-1
+- Update to 6.0.24.
+
 * Tue Dec 22 2009 Alexander Kurtakov <akurtako@redhat.com> 0:6.0.20-2
 - Drop file requires on /usr/share/java/ecj.jar.