SPECS: tomcat.spec - cleanup

[paszczus]

Author: paszczus                     Date: Thu Apr 16 08:29:42 2009 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- cleanup

---- Files affected:
SPECS:
   tomcat.spec (1.121 -> 1.122) 

---- Diffs:

================================================================
Index: SPECS/tomcat.spec
diff -u SPECS/tomcat.spec:1.121 SPECS/tomcat.spec:1.122
--- SPECS/tomcat.spec:1.121	Thu Apr 16 10:18:39 2009
+++ SPECS/tomcat.spec	Thu Apr 16 10:29:37 2009
@@ -28,9 +28,7 @@
 Patch3:		apache-%{name}-skip-jdt.patch
 Patch4:		apache-%{name}-no-connectors.patch
 Patch5:		apache-%{name}-dbcp.patch
-# this patch is needed for struts >= 1.3
 Patch6:		apache-%{name}-struts.patch
-# WTF? Why is it needed? Is it related to struts version?
 Patch7:		apache-%{name}-admin-struts.patch
 Patch8:		apache-%{name}-no_links_to_examples.patch
 URL:		http://tomcat.apache.org/
@@ -38,7 +36,6 @@
 BuildRequires:	java-sun >= 1.5
 BuildRequires:	java-sun-jre >= 1.5
 %else
-# BuildRequires:	jsse >= 0:1.0.3
 BuildRequires:	java-gcj-compat-devel
 %endif
 BuildRequires:	ant >= 1.5.3
@@ -69,11 +66,9 @@
 BuildRequires:	java-mail >= 0:1.3.1
 BuildRequires:	java-puretls
 BuildRequires:	java-servletapi5 = %{version}
-#BuildRequires:	java-struts >= 0:1.2.7
 BuildRequires:	java-struts >= 1.0.2
 BuildRequires:	java-xerces >= 0:2.7.1
 BuildRequires:	java-xml-commons
-#BuildRequires:	java-xml-commons >= 1.3
 BuildRequires:	jaxp_parser_impl >= 0:2.7.1
 BuildRequires:	jdbc-stdext >= 0:2.0
 BuildRequires:	jmx
@@ -91,13 +86,10 @@
 Requires(pre):	/usr/sbin/useradd
 Requires:	%{name}-jasper = %{version}-%{release}
 Requires:	jaas
-#Requires:	jaf >= 1.0.1
 Requires:	java-commons-beanutils
 Requires:	java-commons-collections
-#Requires:	java-commons-dbcp-tomcat5
 Requires:	java-commons-digester
 Requires:	java-commons-el
-#Requires:	java-commons-fileupload
 Requires:	java-commons-logging
 Requires:	java-commons-modeler
 Requires:	java-commons-pool-tomcat5
@@ -199,17 +191,16 @@
 %patch7 -p1
 %patch8 -p1
 
-# we don't need dos scripts
+# we don't need those scripts
 rm -f container/catalina/src/bin/*.bat
-# or those
 rm -f container/catalina/src/bin/{startup,shutdown}.sh
 
 # causes file(1) rpm to abort, and not really neccessary file
-rm container/webapps/admin/images/Thumbs.db
 # file: Thumbs.db: ERROR: Cannot read short stream (Invalid argument)
 # rpm: error: magic_file(ms, "Thumbs.db") failed: mode 37777700644 Cannot read short stream (Invalid argument)
+rm container/webapps/admin/images/Thumbs.db
 
-# servletapi built from jakarta-servletapi5.spec
+# servletapi built from java-servletapi5.spec
 rm -rf servletapi
 
 # Remove pre-built jars
@@ -457,6 +448,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.122  2009/04/16 08:29:37  paszczus
+- cleanup
+
 Revision 1.121  2009/04/16 08:18:39  paszczus
 - added Patch8 which removes broken links from menu; rel 0.9
 
@@ -476,7 +470,7 @@
 - +x for some dirs
 
 Revision 1.115  2009/04/12 18:53:07  pawelz
-- add it also to %%files
+- add it also to %files
 
 Revision 1.114  2009/04/12 18:43:45  pawelz
 - one more symlink to /var/log/tomcat
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/tomcat.spec?r1=1.121&r2=1.122&f=u