packages: java-servletapi5/java-servletapi5.spec - unified java(jsp) and ja...

[qboosh]

Author: qboosh                       Date: Sat Feb 12 13:44:41 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- unified java(jsp) and java(servlet) Provides

---- Files affected:
packages/java-servletapi5:
   java-servletapi5.spec (1.31 -> 1.32) 

---- Diffs:

================================================================
Index: packages/java-servletapi5/java-servletapi5.spec
diff -u packages/java-servletapi5/java-servletapi5.spec:1.31 packages/java-servletapi5/java-servletapi5.spec:1.32
--- packages/java-servletapi5/java-servletapi5.spec:1.31	Sun Apr 18 10:59:48 2010
+++ packages/java-servletapi5/java-servletapi5.spec	Sat Feb 12 14:44:36 2011
@@ -1,6 +1,7 @@
 # $Revision$, $Date$
+# NOTE: for more recent version of servletapi see tomcat.spec
 # TODO:
-#   - fix all specs that requires servletapi5, servlet etc. They should require java(Servlet)
+#   - fix all specs that requires servletapi5, servlet etc. They should require java(servlet)
 #   - split into two packages, if it really needs to co-exist with other servlet-api.jar provider
 #
 # Conditional build:
@@ -12,24 +13,25 @@
 %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
+Summary:	Java Servlet 2.4 and JSP 2.0 implementation classes
+Summary(pl.UTF-8):	Klasy z implementacją Java Servlet 2.4 i JSP 2.0
 Name:		java-servletapi5
-Version:	5.5.28
-Release:	3
+Version:	5.5.33
+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:	73cd758f32dff07e7d26817b50d3448d
+# Source0-md5:	7811f4f1cdfd37cb22d421d2030818de
 Patch0:		jakarta-servletapi5-target.patch
 URL:		http://tomcat.apache.org/
 BuildRequires:	ant
-BuildRequires:	jdk
+BuildRequires:	jdk >= 1.5
 BuildRequires:	jpackage-utils
 BuildRequires:	rpm-javaprov
 Requires:	jpackage-utils
-Provides:	java(JSP) = %{jspapiver}
-Provides:	java(Servlet) = %{servletapiver}
+Requires:	jre >= 1.5
+Provides:	java(jsp) = %{jspapiver}
+Provides:	java(servlet) = %{servletapiver}
 Obsoletes:	classpathx_servlet
 Obsoletes:	jakarta-servletapi
 Obsoletes:	jakarta-servletapi5
@@ -38,26 +40,27 @@
 
 %description
 This subproject contains the compiled code for the implementation
-classes of the Java Servlet and JSP APIs (packages javax.servlet,
-javax.servlet.http, javax.servlet.jsp, and javax.servlet.jsp.tagext).
+classes of the Java Servlet 2.4 and JSP 2.0 APIs (packages
+javax.servlet, javax.servlet.http, javax.servlet.jsp, and
+javax.servlet.jsp.tagext).
 
 %description -l pl.UTF-8
 Ten podprojekt zawiera skompilowany kod implementacji klas API Java
-Servlet i JSP (pakiety javax.servlet, javax.servlet.http,
+Servlet 2.4 i JSP 2.0 (pakiety javax.servlet, javax.servlet.http,
 javax.servlet.jsp i java.servlet.jsp.tagext).
 
 %package javadoc
-Summary:	servletapi documentation
-Summary(pl.UTF-8):	Dokumentacja do servletapi
+Summary:	servletapi 5 documentation
+Summary(pl.UTF-8):	Dokumentacja do servletapi 5
 Group:		Documentation
 Requires:	jpackage-utils
 Obsoletes:	jakarta-servletapi5-javadoc
 
 %description javadoc
-servletapi documentation.
+servletapi 5 documentation.
 
 %description javadoc -l pl.UTF-8
-Dokumentacja do servletapi.
+Dokumentacja do servletapi 5.
 
 %prep
 %setup -qc
@@ -85,7 +88,6 @@
 cp -a jsr154/dist/lib/servlet-api.jar $RPM_BUILD_ROOT%{_javadir}/servlet-api-%{servletapiver}.jar
 
 ln -s servlet-api-%{servletapiver}.jar $RPM_BUILD_ROOT%{_javadir}/servlet-api.jar
-ln -s servlet-api-%{servletapiver}.jar $RPM_BUILD_ROOT%{_javadir}/servlet.jar
 ln -s jsp-api-%{jspapiver}.jar $RPM_BUILD_ROOT%{_javadir}/jsp-api.jar
 
 # javadoc
@@ -104,7 +106,10 @@
 
 %files
 %defattr(644,root,root,755)
-%{_javadir}/*.jar
+%{_javadir}/jsp-api-%{jspapiver}.jar
+%{_javadir}/jsp-api.jar
+%{_javadir}/servlet-api-%{servletapiver}.jar
+%{_javadir}/servlet-api.jar
 
 %if %{with javadoc}
 %files javadoc
@@ -119,6 +124,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.32  2011/02/12 13:44:36  qboosh
+- unified java(jsp) and java(servlet) Provides
+
 Revision 1.31  2010/04/18 08:59:48  jajcus
 - always install servlet-api.jar, otherwise 'Provides: java(Servlet)' makes no sense.
 
================================================================

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