Author: pawelz Date: Mon Aug 17 14:27:55 2009 GMT
Module: packages Tag: DEVEL
---- Log message:
- removed a lot of commented lines
- some Obsoletes
---- Files affected:
packages/tomcat:
tomcat.spec (1.124.2.6 -> 1.124.2.7)
---- Diffs:
================================================================
Index: packages/tomcat/tomcat.spec
diff -u packages/tomcat/tomcat.spec:1.124.2.6
packages/tomcat/tomcat.spec:1.124.2.7
--- packages/tomcat/tomcat.spec:1.124.2.6 Mon Aug 17 16:11:55 2009
+++ packages/tomcat/tomcat.spec Mon Aug 17 16:27:50 2009
@@ -57,13 +57,8 @@
Requires(pre): /usr/sbin/useradd
Requires: %{name}-jasper = %{version}-%{release}
Requires: jaas
-Requires: java-commons-beanutils
-Requires: java-commons-collections
-Requires: java-commons-digester
-Requires: java-commons-el
+Requires: java-commons-daemon
Requires: java-commons-logging
-Requires: java-commons-modeler
-Requires: java-commons-pool-tomcat5
Requires: java-jdbc-mysql
Requires: java-regexp
Requires: java-xml-commons
@@ -114,7 +109,7 @@
Group: Documentation
Obsoletes: apache-tomcat-doc
Obsoletes: jakarta-tomcat-doc
-Obsoletes: %{name}-doc
+Obsoletes: tomcat-doc
%description webapp-docs
The Tomcat Servlet/JSP Container documentation.
@@ -137,6 +132,7 @@
Summary: The Apache Tomcat Servlet/JSP virtual hosts manager
Summary(pl.UTF-8): Zarządca wirtualnych hostów w Tomcacie
Group: Networking/Daemons/Java/Servlets
+Obsoletes: tomcat-admin
%description webapp-host-manager
The Apache Tomcat Servlet/JSP virtual hosts manager.
@@ -155,19 +151,6 @@
%description webapp-examples -l pl.UTF-8
Przykładowe aplikacje dla Tomcata.
-# %package admin
-# 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}
-# Requires: java-commons-chain
-#
-# %description admin
-# Administration Web Application for Apache Tomcat.
-#
-# %description admin -l pl.UTF-8
-# Panel Administracyjny dla Apache Tomcat.
-
%package jasper
Summary: JSP compiler
Summary(pl.UTF-8): Kompilator JSP
@@ -242,30 +225,6 @@
ln -sf $jar $TOMCATDIR/bin
done
-# jars="commons-el commons-dbcp-tomcat5 commons-pool-tomcat5 servlet-api
jsp-api commons-modeler jdbc-mysql"
-# for jar in $jars; do
-# jar=$(find-jar $jar)
-# ln -sf $jar $TOMCATDIR/common/lib
-# done
-#
-# jars="jaxp_parser_impl xml-commons-apis"
-# for jar in $jars; do
-# jar=$(find-jar $jar)
-# ln -sf $jar $TOMCATDIR/common/endorsed
-# done
-
-# jars="struts-core struts-taglib commons-collections commons-beanutils-core
commons-digester commons-chain"
-# for jar in $jars; do
-# jar=$(find-jar $jar)
-# ln -sf $jar $TOMCATDIR/server/webapps/admin/WEB-INF/lib
-# done
-
-# jars="commons-modeler"
-# for jar in $jars; do
-# jar=$(find-jar $jar)
-# ln -sf $jar $TOMCATDIR/server/lib
-# done
-
install -d $RPM_BUILD_ROOT%{_javadir}
mv $TOMCATDIR/lib/jasper*.jar $RPM_BUILD_ROOT%{_javadir}
@@ -375,6 +334,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.124.2.7 2009/08/17 14:27:50 pawelz
+- removed a lot of commented lines
+- some Obsoletes
+
Revision 1.124.2.6 2009/08/17 14:11:55 pawelz
- updated last commit log (I commited this file by accident...)
- updated TODO
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/tomcat/tomcat.spec?r1=1.124.2.6&r2=1.124.2.7&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
