SPECS (tomcat5): jakarta-tomcat.spec - save some progress

[glen]

Author: glen                         Date: Tue Apr 10 00:09:56 2007 GMT
Module: SPECS                         Tag: tomcat5
---- Log message:
- save some progress

---- Files affected:
SPECS:
   jakarta-tomcat.spec (1.36.2.5 -> 1.36.2.6) 

---- Diffs:

================================================================
Index: SPECS/jakarta-tomcat.spec
diff -u SPECS/jakarta-tomcat.spec:1.36.2.5 SPECS/jakarta-tomcat.spec:1.36.2.6
--- SPECS/jakarta-tomcat.spec:1.36.2.5	Wed Jan 31 20:15:57 2007
+++ SPECS/jakarta-tomcat.spec	Tue Apr 10 02:09:51 2007
@@ -31,6 +31,7 @@
 BuildRequires:	mx4j >= 1.1.1
 BuildRequires:	puretls
 BuildRequires:	rpmbuild(macros) >= 1.300
+BuildRequires:	xerces-j
 # optional:
 BuildRequires:	jaf >= 1.0.1
 BuildRequires:	jakarta-commons-daemon
@@ -139,9 +140,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 mx4j/mx4j)
-jmx-tools.jar=$(build-classpath mx4j/mx4j-tools)
-jmxri.jar=$(build-classpath mx4j/mx4j-jmx)
+jmx.jar=$(build-classpath jre/jmx)
+jmx-tools.jar=$(build-classpath jre/jmx)
+jmxri.jar=$(build-classpath jre/jmx)
 junit.jar=$(build-classpath junit)
 regexp.jar=$(build-classpath regexp)
 servlet-api.jar=$TOPDIR/jakarta-servletapi-5/jsr154/dist/lib/servlet-api.jar
@@ -155,21 +156,22 @@
 mail.jar=$(build-classpath javamail/mailapi)
 jta.jar=$(build-classpath jta)
 tyrex.jar=$(build-classpath tyrex)
-jaas.jar=$(build-classpath jaas)
-jndi.jar=$(build-classpath jndi)
+jaas.jar=$(build-classpath jre/jaas)
+jndi.jar=$(build-classpath jre/jndi)
 jdbc20ext.jar=$(build-classpath jdbc-stdext)
 puretls.jar=$(build-classpath puretls)
-jcert.jar=$(build-classpath jsse/jcert)
-jnet.jar=$(build-classpath jsse/jnet)
-jsse.jar=$(build-classpath jsse/jsse)
+jcert.jar=$(build-classpath java/jcert)
+jnet.jar=$(build-classpath java/jnet)
+jsse.jar=$(build-classpath java/jsse)
 servletapi.build.notrequired=true
 jspapi.build.notrequired=true
 taglibs-core.jar=$(build-classpath taglibs-core)
 taglibs-standard.jar=$(build-classpath taglibs-standard)
 EOBP
 
-# can't use jikes to build tomcat5 (strange)
-%ant -Dbuild.compiler=modern -Djava.home=%{java_home} build
+%ant \
+	-Dbuild.compiler=modern \
+	-Djava.home=%{java_home} build
 
 # build the connectors
 cd ../jakarta-tomcat-connectors
@@ -200,18 +202,18 @@
 tyrex.jar=$(build-classpath tyrex)
 jaas.jar=$(build-classpath jaas)
 jndi.jar=$(build-classpath jndi)
-jdbc20ext.jar=$(build-classpath jdbc-stdext)
+jdbc20ext.jar=$(build-classpath java/jdbc-stdext)
 puretls.jar=$(build-classpath puretls)
 jcert.jar=$(build-classpath jsse/jcert)
 jnet.jar=$(build-classpath jsse/jnet)
 jsse.jar=$(build-classpath jsse/jsse)
 EOBP
-ant -Dbuild.compiler=modern -Djava.home=%{java_home} build
+%ant -Dbuild.compiler=modern -Djava.home=%{java_home} build
 export CLASSPATH=$oldclasspath
 
 # build the webapps and make the tree ready to install
 cd ../jakarta-tomcat-5
-ant -Dbuild.compiler=modern -Djava.home=%{java_home} dist
+%ant -Dbuild.compiler=modern -Djava.home=%{java_home} dist
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -350,12 +352,14 @@
 %doc catalina/docs/*
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
-
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.36.2.6  2007/04/10 00:09:51  glen
+- save some progress
+
 Revision 1.36.2.5  2007/01/31 19:15:57  glen
 - cleanup
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/jakarta-tomcat.spec?r1=1.36.2.5&r2=1.36.2.6&f=u