rpms/tomcat5/devel tomcat5.spec,1.66,1.67

[fedora-cvs-commits at redhat.com]

Author: fnasser

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

Modified Files:
	tomcat5.spec 
Log Message:
Use any JTA for now




Index: tomcat5.spec
===================================================================
RCS file: /cvs/dist/rpms/tomcat5/devel/tomcat5.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- tomcat5.spec	5 Jul 2006 22:50:50 -0000	1.66
+++ tomcat5.spec	6 Jul 2006 15:02:10 -0000	1.67
@@ -159,7 +159,8 @@
 BuildRequires: jakarta-taglibs-standard >= 0:1.1.0
 # formerly non-free stuff
 # geronimo-specs replaces non-free jta
-BuildRequires: geronimo-jta-1.0.1B-api
+#BuildRequires: geronimo-jta-1.0.1B-api
+BuildRequires: jta >= 0:1.0.1
 # jaf can be provided by classpathx-jaf
 #BuildRequires: jaf >= 0:1.0.2
 BuildRequires: jaf >= 0:1.0.1
@@ -296,8 +297,10 @@
 Requires: jndi
 Requires(post): jndi
 # geronimo-specs replaces non-free jta
-Requires: geronimo-jta-1.0.1B-api
-Requires(post): geronimo-jta-1.0.1B-api
+#Requires: geronimo-jta-1.0.1B-api
+Requires: jta >= 0:1.0.1
+#Requires(post): geronimo-jta-1.0.1B-api
+Requires(post): jta >= 0:1.0.1
 Requires: mx4j >= 0:3.0.1
 Requires(post): mx4j >= 0:3.0.1
 %if %{with_ecj}
@@ -502,7 +505,8 @@
 struts.lib=%{_datadir}/struts
 activation.jar=$(build-classpath jaf)
 mail.jar=$(build-classpath javamail/mailapi)
-jta.jar=$(build-classpath geronimo-jta-1.0.1B-api)
+#jta.jar=$(build-classpath geronimo-jta-1.0.1B-api)
+jta.jar=$(build-classpath jta)
 jaas.jar=$(build-classpath jaas)
 jndi.jar=$(build-classpath jndi)
 jdbc20ext.jar=$(build-classpath jdbc-stdext)
@@ -537,7 +541,8 @@
 jmx.jar=$(build-classpath mx4j/mx4j-jmx)
 activation.jar=$(build-classpath jaf)
 mail.jar=$(build-classpath javamail/mailapi)
-jta.jar=$(build-classpath geronimo-jta-1.0.1B-api)
+#jta.jar=$(build-classpath geronimo-jta-1.0.1B-api)
+jta.jar=$(build-classpath jta)
 jaas.jar=$(build-classpath jaas)
 jndi.jar=$(build-classpath jndi)
 jdbc20ext.jar=$(build-classpath jdbc-stdext)
@@ -857,10 +862,12 @@
 build-jar-repository %{commondir}/lib ant commons-collections commons-dbcp \
                                       commons-el commons-logging-api \
                                       commons-pool jaf javamail jdbc-stdext \
-                                      jndi jsp geronimo-jta-1.0.1B-api \
+                                      jndi jsp \
                                       mx4j/mx4j \
                                       servlet %{jname}5-compiler \
                                       %{jname}5-runtime 2>&1
+#build-jar-repository %{commondir}/lib geronimo-jta-1.0.1B-api 2>&1
+build-jar-repository %{commondir}/lib jta 2>&1
 %if %{with_ecj}
 pushd %{commondir}/lib
 ln -sf %{_javadir}/jdtcore.jar .
@@ -1193,6 +1200,7 @@
 %changelog
 * Wed Jul 05 2006 Fernando Nasser <fnasser at redhat.com> 0:5.5.17-3jpp_1fc
 - Upgrade
+- Use any JTA for now
 
 * Wed Jul 05 2006 Fernando Nasser <fnasser at redhat.com> 0:5.5.17-3jpp_1rh
 - Merge with upstream