packages: tomcat/tomcat.spec - remove unused macro, misc changes

glen glen at pld-linux.org
Tue Jun 30 01:42:12 CEST 2009


Author: glen                         Date: Mon Jun 29 23:42:12 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- remove unused macro, misc changes

---- Files affected:
packages/tomcat:
   tomcat.spec (1.127 -> 1.128) 

---- Diffs:

================================================================
Index: packages/tomcat/tomcat.spec
diff -u packages/tomcat/tomcat.spec:1.127 packages/tomcat/tomcat.spec:1.128
--- packages/tomcat/tomcat.spec:1.127	Tue Jun  9 20:15:28 2009
+++ packages/tomcat/tomcat.spec	Tue Jun 30 01:42:06 2009
@@ -1,4 +1,6 @@
 # $Revision$, $Date$
+# TODO
+# - rename %{name}-jasper -> java-jasper?
 #
 # Conditional build:
 %bcond_without	javadoc		# skip building javadocs
@@ -9,7 +11,7 @@
 Summary(pl.UTF-8):	Silnik Servlet/JSP Apache będący wzorcową implementacją API Servlet 2.4/JSP 2.0
 Name:		tomcat
 Version:	5.5.27
-Release:	2
+Release:	1
 License:	Apache v2.0
 Group:		Networking/Daemons/Java
 Source0:	http://www.apache.org/dist/tomcat/tomcat-5/v%{version}/src/apache-%{name}-%{version}-src.tar.gz
@@ -125,8 +127,6 @@
 %define		_vardir		%{_var}/lib/tomcat
 %define		_sysconfdir	/etc/tomcat
 
-%define find_jar() %{expand:%%define jarfile {%(jar=$(find-jar %1); echo ${jar:-%%nil})}}%{?jarfile}%{!?jarfile:%{error:find-jar %1 failed}}%{nil}
-
 %description
 Tomcat is the servlet container that is used in the official Reference
 Implementation for the Java Servlet and JavaServer Pages technologies.
@@ -158,7 +158,7 @@
 Dokumentacja do Tomcata - kontenera Servlet/JSP.
 
 %package admin
-Summary:	Apache Tomcat`s Administration Web Application
+Summary:	Apache Tomcat's Administration Web Application
 Summary(pl.UTF-8):	Panel Administracyjny dla Apache Tomcat
 Group:		Networking/Daemons/Java/Servlets
 Requires:	%{name} = %{version}-%{release}
@@ -422,8 +422,7 @@
 %{_tomcatdir}/work
 %{_tomcatdir}/shared
 %dir %{_vardir}
-# these directory has to be writeable because /admin need to modify config
-# files and create temporary files
+# these directories have to be writeable because /admin needs to modify config files and create temporary files
 %dir %attr(775,root,tomcat) %{_vardir}/conf
 %dir %attr(775,root,tomcat) %{_vardir}/conf/Catalina
 %dir %{_vardir}/conf/Catalina/localhost
@@ -461,6 +460,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.128  2009/06/29 23:42:06  glen
+- remove unused macro, misc changes
+
 Revision 1.127  2009/06/09 18:15:28  pawelz
 - added security-related patches (backported from svn trunk)
 - dropped security blockers
================================================================

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



More information about the pld-cvs-commit mailing list