packages: java-servletapi5/java-servletapi5.spec - up to 5.5.28 - P: java(J...

[pawelz]

Author: pawelz                       Date: Wed Aug 19 07:06:16 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 5.5.28
- P: java(JSP) = %{jspapiver}
- P: java(Servlet) = %{servletapiver}
- dropped old "Provides"

---- Files affected:
packages/java-servletapi5:
   java-servletapi5.spec (1.22 -> 1.23) 

---- Diffs:

================================================================
Index: packages/java-servletapi5/java-servletapi5.spec
diff -u packages/java-servletapi5/java-servletapi5.spec:1.22 packages/java-servletapi5/java-servletapi5.spec:1.23
--- packages/java-servletapi5/java-servletapi5.spec:1.22	Tue Jun  9 20:28:23 2009
+++ packages/java-servletapi5/java-servletapi5.spec	Wed Aug 19 09:06:10 2009
@@ -1,6 +1,6 @@
 # $Revision$, $Date$
 # TODO:
-# - shouldn't it be java-servletapi-2.4 ?
+# - fix all specs that requires servletapi5, servlet etc. They should require java(Servlet)
 #
 # Conditional build:
 %bcond_without	javadoc		# don't build javadoc
@@ -10,21 +10,22 @@
 %bcond_with	java_sun	# use java-sun
 %endif
 
+%define		jspapiver	2.0
+%define		servletapiver	2.4
+
 %include	/usr/lib/rpm/macros.java
 
 %define		srcname		servletapi5
 Summary:	Java servlet and JSP implementation classes
 Summary(pl.UTF-8):	Klasy z implementacją Java Servlet i JSP
 Name:		java-servletapi5
-Version:	5.5.27
-Release:	6
+Version:	5.5.28
+Release:	1
 License:	Apache v2
 Group:		Libraries/Java
 Source0:	http://www.apache.org/dist/tomcat/tomcat-5/v%{version}/src/apache-tomcat-%{version}-src.tar.gz
-# Source0-md5:	eb3f196013550b9b1684e4ff18593a8e
+# Source0-md5:	73cd758f32dff07e7d26817b50d3448d
 Patch0:		jakarta-servletapi5-target.patch
-# This patch is applied in tomcat svn. Remove it while upgrading to 5.5.28.
-Patch1:		%{name}-CVE-2009-0781.patch
 URL:		http://tomcat.apache.org/
 BuildRequires:	ant
 %{!?with_java_sun:BuildRequires:	java-gcj-compat-devel}
@@ -34,14 +35,8 @@
 BuildRequires:	rpmbuild(macros) >= 1.300
 Requires:	jpackage-utils
 Provides:	jakarta-servletapi5
-Provides:	jsp = 2.0
-Provides:	servlet = 2.4
-# for compatibility with some packages. But it is not true:
-Provides:	servlet = %{version}
-Provides:	servlet24
-Provides:	servlet5
-Provides:	servletapi = 2.4
-Provides:	servletapi5
+Provides:	java(JSP) = %{jspapiver}
+Provides:	java(Servlet) = %{servletapiver}
 Obsoletes:	classpathx_servlet
 Obsoletes:	jakarta-servletapi
 Obsoletes:	jakarta-servletapi5
@@ -74,8 +69,7 @@
 %prep
 %setup -qc
 mv apache-tomcat-%{version}-src/servletapi/* .
-%patch0 -p2
-%patch1 -p1
+%patch0 -p0
 
 %build
 
@@ -135,6 +129,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.23  2009/08/19 07:06:10  pawelz
+- up to 5.5.28
+- P: java(JSP) = %{jspapiver}
+- P: java(Servlet) = %{servletapiver}
+- dropped old "Provides"
+
 Revision 1.22  2009/06/09 18:28:23  pawelz
 - security patch (CVE-2009-0781)
 - rel 6
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/java-servletapi5/java-servletapi5.spec?r1=1.22&r2=1.23&f=u