packages: tomcat/tomcat.spec - include java rpm macros - removed TODOs - re...

[pawelz]

Author: pawelz                       Date: Tue Aug 18 15:44:35 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- include java rpm macros
- removed TODOs
- require sun jre
- adapterized

---- Files affected:
packages/tomcat:
   tomcat.spec (1.129 -> 1.130) 

---- Diffs:

================================================================
Index: packages/tomcat/tomcat.spec
diff -u packages/tomcat/tomcat.spec:1.129 packages/tomcat/tomcat.spec:1.130
--- packages/tomcat/tomcat.spec:1.129	Tue Aug 18 17:40:11 2009
+++ packages/tomcat/tomcat.spec	Tue Aug 18 17:44:30 2009
@@ -1,16 +1,14 @@
 # $Revision$, $Date$
-# TODO
-# - review dependencies
-# - packages for *.renametojar files (-cgi and -ssi in server/lib)
+
 # 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
 %define		servletapiver	2.5
 
+%include	/usr/lib/rpm/macros.java
 Summary:	Apache Servlet/JSP Engine, RI for Servlet %{servletapiver}/JSP %{jspapiver}API
 Summary(pl.UTF-8):	Silnik Servlet/JSP Apache będący wzorcową implementacją API Servlet %{servletapiver}/JSP %{jspapiver}
 Name:		tomcat
@@ -49,8 +47,8 @@
 BuildRequires:	java-commons-dbcp >= 0:1.1
 BuildRequires:	java-commons-dbcp-tomcat5 >= 0:1.1
 %if %{with webservices}
-BuildRequires:	java-geronimo-spec-jaxrpc
 BuildRequires:	java(JSR109)
+BuildRequires:	java-geronimo-spec-jaxrpc
 %endif
 BuildRequires:	jpackage-utils
 BuildRequires:	rpmbuild(macros) >= 1.300
@@ -66,9 +64,9 @@
 Requires:	java-commons-daemon
 Requires:	java-commons-logging
 Requires:	java-servletapi = %{epoch}:%{version}-%{release}
+Requires:	java-sun-jre >= 1.2
 Requires:	jaxp_parser_impl
 Requires:	jndi >= 1.2.1
-Requires:	jre >= 1.2
 Requires:	rc-scripts
 Provides:	group(servlet)
 Provides:	group(tomcat)
@@ -153,8 +151,8 @@
 %package webservices
 Summary:	Web Services support (JSR 109)
 Group:		Libraries/Java
-Requires:	java-geronimo-spec-jaxrpc
 Requires:	java(JSR109)
+Requires:	java-geronimo-spec-jaxrpc
 
 %description webservices
 Factories for JSR 109 which may be used to resolve web services
@@ -412,6 +410,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.130  2009/08/18 15:44:30  pawelz
+- include java rpm macros
+- removed TODOs
+- require sun jre
+- adapterized
+
 Revision 1.129  2009/08/18 15:40:11  pawelz
 - merged DEVEL
 - tomcat 5.5 saved on TOMCAT-5_5 branch
================================================================

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