packages: java-servletapi5/java-servletapi5.spec - always install servlet-a...

[jajcus]

Author: jajcus                       Date: Sun Apr 18 08:59:53 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- always install servlet-api.jar, otherwise 'Provides: java(Servlet)' makes no sense.

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

---- Diffs:

================================================================
Index: packages/java-servletapi5/java-servletapi5.spec
diff -u packages/java-servletapi5/java-servletapi5.spec:1.30 packages/java-servletapi5/java-servletapi5.spec:1.31
--- packages/java-servletapi5/java-servletapi5.spec:1.30	Sat Apr 17 22:01:47 2010
+++ packages/java-servletapi5/java-servletapi5.spec	Sun Apr 18 10:59:48 2010
@@ -1,6 +1,7 @@
 # $Revision$, $Date$
 # 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:
 %bcond_without	javadoc		# don't build javadoc
@@ -83,13 +84,9 @@
 cp -a jsr152/dist/lib/jsp-api.jar $RPM_BUILD_ROOT%{_javadir}/jsp-api-%{jspapiver}.jar
 cp -a jsr154/dist/lib/servlet-api.jar $RPM_BUILD_ROOT%{_javadir}/servlet-api-%{servletapiver}.jar
 
-# Don't install these files in distros where tomcat6 is available, to allow it
-# to co-exist with java-servletapi-6.0
-%if "%{pld_release}" != "th"
 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
-%endif
 
 # javadoc
 %if %{with javadoc}
@@ -122,6 +119,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.31  2010/04/18 08:59:48  jajcus
+- always install servlet-api.jar, otherwise 'Provides: java(Servlet)' makes no sense.
+
 Revision 1.30  2010/04/17 20:01:47  jajcus
 - do not force gcj/java_sun
 
================================================================

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