rpms/tomcat5/devel tomcat5-5.0.30-precompile.patch, NONE, 1.1 tomcat5.spec, 1.25, 1.26 tomcat5-5.0.30-bz157205.patch, 1.1, NONE

[fedora-cvs-commits at redhat.com]

Author: gbenson

Update of /cvs/dist/rpms/tomcat5/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5244

Modified Files:
	tomcat5.spec 
Added Files:
	tomcat5-5.0.30-precompile.patch 
Removed Files:
	tomcat5-5.0.30-bz157205.patch 
Log Message:
Various tidying

tomcat5-5.0.30-precompile.patch:
 build.xml |    3 +++
 1 files changed, 3 insertions(+)

--- NEW FILE tomcat5-5.0.30-precompile.patch ---
--- tomcat5-5.0.30/jakarta-tomcat-5.0.30-src/jakarta-tomcat-5/build.xml~	2005-05-09 13:41:39.000000000 +0100
+++ tomcat5-5.0.30/jakarta-tomcat-5.0.30-src/jakarta-tomcat-5/build.xml	2005-05-09 14:50:41.000000000 +0100
@@ -275,6 +275,9 @@
     <path id="jspc.classpath">
       <pathelement location="${java.home}/../lib/tools.jar"/>
       <pathelement location="${commons-logging.jar}"/>
+      <pathelement location="${jmx.jar}"/>
+      <pathelement location="${taglibs-core.jar}"/>
+      <pathelement location="${taglibs-standard.jar}"/>
       <pathelement location="${tomcat.build}/server/classes"/>
       <fileset dir="${tomcat.build}/server/lib">
         <include name="*.jar"/>


Index: tomcat5.spec
===================================================================
RCS file: /cvs/dist/rpms/tomcat5/devel/tomcat5.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- tomcat5.spec	31 May 2005 12:49:32 -0000	1.25
+++ tomcat5.spec	31 May 2005 16:06:55 -0000	1.26
@@ -53,10 +53,9 @@
 Patch7:			%{jname}_command.patch
 Patch8:			%{name}-%{version}-bootstrap.MF.patch
 Patch9:			%{name}-%{version}-catalina.sh.patch
-Patch10:		%{name}-%{version}-bz157205.patch
+Patch10:		%{name}-%{version}-precompile.patch
 Patch11:		%{name}-%{version}-no-daemon.patch
 BuildRoot:		%{_tmppath}/%{name}-root-%{version}
-Obsoletes:		tomcat tomcat-libs tomcat-devel tomcat-test
 
 Requires:		jpackage-utils >= 0:1.6.0
 Requires:		ant >= 0:1.6.2
@@ -78,12 +77,12 @@
 Requires:		jakarta-commons-el >= 0:1.0
 Requires:		mx4j >= 0:1.1.1
 # alternatives
-#Requires:		jaas
+Requires:		jaas
 Requires:		jndi
 Requires:		jndi-ldap
 Requires:		jdbc-stdext
 # non-free stuff
-#Requires:		jta >= 0:1.0.1-0.a.1
+Requires:		jta
 Requires:		jaf >= 0:1.0.1
 Requires:		javamail >= 0:1.3
 # subpackages
@@ -105,14 +104,14 @@
 BuildRequires:		jakarta-commons-pool >= 0:1.1
 BuildRequires:		jakarta-commons-launcher >= 0:0.9
 BuildRequires:		jakarta-commons-el >= 0:1.0
-#BuildRequires:		jaas
+BuildRequires:		jaas
 BuildRequires:		jaf >= 0:1.0.1
 BuildRequires:		javamail >= 0:1.3
 BuildRequires:		jdbc-stdext >= 0:2.0
 BuildRequires:		jndi >= 0:1.2.1
 BuildRequires:		jndi-ldap
-#BuildRequires:		jsse >= 0:1.0.2
-#BuildRequires:		jta >= 0:1.0.1-0.a.1
+BuildRequires:		jsse
+BuildRequires:		jta
 BuildRequires:		junit >= 0:3.8.1
 BuildRequires:		mx4j >= 0:1.1.1
 BuildRequires:		regexp >= 0:1.3
@@ -121,6 +120,8 @@
 BuildRequires:		xerces-j2 >= 0:2.6.2
 BuildRequires:		xml-commons-apis
 BuildRequires:		jakarta-taglibs-standard >= 0:1.1.0
+# RHEL3 and FC2
+Obsoletes:		tomcat tomcat-libs tomcat-devel tomcat-test
 # libgcj aot-compiled native libraries
 BuildRequires:          gcc-java >= 4.0.0-0.43
 BuildRequires:          java-1.4.2-gcj-compat >= 1.4.2.0-40jpp_16rh
@@ -621,16 +622,18 @@
 
 build-jar-repository %{serverdir}/lib commons-beanutils commons-fileupload \
                                       commons-digester commons-logging \
-                                      commons-modeler commons-el regexp mx4j/mx4j-jmx jaas \
-                                      catalina-ant5 2>&1
+                                      commons-modeler commons-el regexp \
+                                      mx4j/mx4j-jmx jaas catalina-ant5 2>&1
 
-build-jar-repository %{commondir}/lib ant ant-launcher commons-collections commons-dbcp \
-                                      commons-pool commons-logging-api commons-el\
-                                      jaf jdbc-stdext jta javamail jndi mx4j/mx4j-jmx \
-                                      jspapi servletapi5 %{jname}-runtime \
-                                      %{jname}-compiler 2>&1
+build-jar-repository %{commondir}/lib ant ant-launcher commons-collections \
+                                      commons-dbcp commons-pool \
+                                      commons-logging-api commons-el \
+                                      jaf jdbc-stdext jta javamail jndi \
+                                      mx4j/mx4j-jmx jspapi servletapi5 \
+                                      %{jname}-runtime %{jname}-compiler 2>&1
 
-build-jar-repository %{commondir}/endorsed jaxp_parser_impl xml-commons-apis 2>&1
+build-jar-repository %{commondir}/endorsed jaxp_parser_impl \
+                                           xml-commons-apis 2>&1
 
 /usr/bin/rebuild-gcj-db %{_libdir}
 


--- tomcat5-5.0.30-bz157205.patch DELETED ---