rpms/tomcat5/devel tomcat5.spec,1.10,1.11

[fedora-cvs-commits at redhat.com]

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

Modified Files:
	tomcat5.spec 
Log Message:
Explicitly specify which mx4j jars to use (#155391)


Index: tomcat5.spec
===================================================================
RCS file: /cvs/dist/rpms/tomcat5/devel/tomcat5.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- tomcat5.spec	11 Apr 2005 09:23:14 -0000	1.10
+++ tomcat5.spec	22 Apr 2005 11:42:55 -0000	1.11
@@ -2,7 +2,7 @@
 %define full_name	jakarta-%{name}
 %define version		5.0.30
 %define majversion	5.0
-%define release		2jpp_2fc
+%define release		2jpp_3fc
 %define section		free
 
 %define summary		Apache Servlet/JSP Engine, RI for Servlet 2.4/JSP 2.0 API
@@ -214,9 +214,9 @@
 commons-logging-api.jar=$(build-classpath commons-logging-api)
 commons-modeler.jar=$(build-classpath commons-modeler)
 commons-pool.jar=$(build-classpath commons-pool)
-jmx.jar=$(build-classpath jmxri)
-jmx-tools.jar=$(build-classpath mx4j/mx4j-tools.jar)
-jmxri.jar=$(build-classpath jmxri)
+jmx.jar=$(build-classpath mx4j/mx4j)
+jmx-tools.jar=$(build-classpath mx4j/mx4j-tools)
+jmxri.jar=$(build-classpath mx4j/mx4j-jmx)
 junit.jar=$(build-classpath junit)
 regexp.jar=$(build-classpath regexp)
 servlet-api.jar=$(build-classpath servletapi5)
@@ -267,7 +267,7 @@
 commons-modeler.jar=$(build-classpath commons-modeler)
 commons-pool.jar=$(build-classpath commons-pool)
 regexp.jar=$(build-classpath regexp)
-jmx.jar=$(build-classpath mx4j/mx4j-jmx)
+jmx.jar=$(build-classpath mx4j/mx4j)
 puretls=$(build-classpath puretls)
 activation.jar=$(build-classpath jaf)
 mail.jar=$(build-classpath javamail/mailapi)
@@ -625,6 +625,9 @@
 %{serverdir}/webapps/*
 
 %changelog
+* Fri Apr 22 2005 Gary Benson <gbenson at redhat.com> 0:5.0.30-1jpp_3fc
+- Explicitly specify which mx4j jars to use (#155391).
+
 * Mon Apr 11 2005 Florian La Roche <laroche at redhat.com>
 - /etc/init.d -> /etc/rc.d/init.d