Author: glen Date: Mon Apr 9 19:04:24 2007 GMT
Module: SPECS Tag: HEAD
---- Log message:
- merge from tomcat5 branch
---- Files affected:
SPECS:
jakarta-tomcat.spec (1.39 -> 1.40)
---- Diffs:
================================================================
Index: SPECS/jakarta-tomcat.spec
diff -u SPECS/jakarta-tomcat.spec:1.39 SPECS/jakarta-tomcat.spec:1.40
--- SPECS/jakarta-tomcat.spec:1.39 Tue Feb 13 09:06:36 2007
+++ SPECS/jakarta-tomcat.spec Mon Apr 9 21:04:18 2007
@@ -1,9 +1,9 @@
# $Revision$, $Date$
+%define base_version 4.0
Summary: The Tomcat Servlet/JSP Container
Summary(pl.UTF-8): Tomcat - Zasobnik servletów/JSP
Name: jakarta-tomcat
Version: 4.1.24
-%define base_version 4.0
Release: 4
License: Apache
Group: Development/Languages/Java
@@ -17,8 +17,8 @@
Patch2: %{name}-fileupload.patch
URL: http://jakarta.apache.org/tomcat/index.html
# required:
-BuildRequires: jaas
BuildRequires: ant >= 1.5.3
+BuildRequires: jaas
BuildRequires: jakarta-commons-beanutils
BuildRequires: jakarta-commons-collections
BuildRequires: jakarta-commons-digester
@@ -29,9 +29,10 @@
BuildRequires: jakarta-struts >= 1.0.2
BuildRequires: jaxp_parser_impl
BuildRequires: jdk >= 1.2
+BuildRequires: jpackage-utils
BuildRequires: mx4j >= 1.1.1
BuildRequires: puretls
-BuildRequires: rpmbuild(macros) >= 1.202
+BuildRequires: rpmbuild(macros) >= 1.300
# optional:
BuildRequires: jaf >= 1.0.1
BuildRequires: jakarta-commons-daemon
@@ -246,17 +247,11 @@
%post
/sbin/chkconfig --add tomcat
-if [ -f /var/lock/subsys/tomcat ]; then
- /etc/rc.d/init.d/tomcat restart 1>&2
-else
- echo "Run \"/etc/rc.d/init.d/tomcat start\" to start tomcat daemon."
-fi
+%service tomcat restart
%preun
if [ "$1" = "0" ]; then
- if [ -f /var/lock/subsys/tomcat ]; then
- /etc/rc.d/init.d/tomcat stop 1>&2
- fi
+ %service tomcat stop
/sbin/chkconfig --del tomcat
fi
@@ -301,11 +296,15 @@
%doc catalina/docs/*
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
+
%changelog
* %{date} PLD Team <[EMAIL PROTECTED]>
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.40 2007/04/09 19:04:18 glen
+- merge from tomcat5 branch
+
Revision 1.39 2007/02/13 08:06:36 glen
- tabs in preamble
@@ -413,8 +412,8 @@
- fixed a small typo
Revision 1.9 2002/03/13 10:54:15 aflinta
- - changed JAVA_HOME patch to proper location
- - release 2
+- changed JAVA_HOME patch to proper location
+- release 2
Revision 1.8 2002/02/23 02:59:08 kloczek
- adapterized.
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/jakarta-tomcat.spec?r1=1.39&r2=1.40&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
