packages: tomcat/tomcat.spec - really don't pull sun's jdk - rel 5

[pawelz]

Author: pawelz                       Date: Fri Apr 23 14:59:35 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- really don't pull sun's jdk
- rel 5

---- Files affected:
packages/tomcat:
   tomcat.spec (1.163 -> 1.164) 

---- Diffs:

================================================================
Index: packages/tomcat/tomcat.spec
diff -u packages/tomcat/tomcat.spec:1.163 packages/tomcat/tomcat.spec:1.164
--- packages/tomcat/tomcat.spec:1.163	Wed Apr 21 19:08:13 2010
+++ packages/tomcat/tomcat.spec	Fri Apr 23 16:59:30 2010
@@ -2,7 +2,6 @@
 
 # Conditional build:
 %bcond_without	javadoc		# skip building javadocs
-%bcond_without	java_sun	# build with gcj (does not work)
 %bcond_without	webservices	# skip building webservices
 
 %define		jspapiver	2.1
@@ -13,7 +12,7 @@
 Summary(pl.UTF-8):	Serwer www i silnik Servlet/JSP będący wzorcową implementacją API Servlet %{servletapiver}/JSP %{jspapiver}
 Name:		tomcat
 Version:	6.0.26
-Release:	4
+Release:	5
 License:	Apache v2.0
 Group:		Networking/Daemons/Java
 Source0:	http://www.apache.org/dist/tomcat/tomcat-6/v%{version}/src/apache-%{name}-%{version}-src.tar.gz
@@ -29,12 +28,6 @@
 Patch0:		%{name}-build.xml.patch
 Patch1:		%{name}-extras.xml.patch
 URL:		http://tomcat.apache.org/
-%if %{with java_sun}
-BuildRequires:	java-sun >= 1.5
-BuildRequires:	java-sun-jre >= 1.5
-%else
-BuildRequires:	icedtea6-jdk
-%endif
 BuildRequires:	ant >= 1.5.3
 BuildRequires:	ant-trax
 BuildRequires:	eclipse-jdt >= 3.2
@@ -456,6 +449,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.164  2010/04/23 14:59:30  pawelz
+- really don't pull sun's jdk
+- rel 5
+
 Revision 1.163  2010/04/21 17:08:13  arekm
 - release 4
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/tomcat/tomcat.spec?r1=1.163&r2=1.164&f=u