rpms/tomcat5/devel tomcat5.spec,1.116,1.117

[David Walluck]

Author: dwalluck

Update of /cvs/pkgs/rpms/tomcat5/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32020

Modified Files:
	tomcat5.spec 
Log Message:
- use Fedora-specific changes to various API levels to allow building


Index: tomcat5.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tomcat5/devel/tomcat5.spec,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- tomcat5.spec	13 Oct 2008 20:58:23 -0000	1.116
+++ tomcat5.spec	14 Oct 2008 02:23:23 -0000	1.117
@@ -71,7 +71,7 @@
 Name: tomcat5
 Epoch: 0
 Version: %{majversion}.%{minversion}
-Release: 4.1%{dist}
+Release: 4.2%{dist}
 Summary: Apache Servlet/JSP Engine, RI for Servlet 2.4/JSP 2.0 API
 
 Group: Networking/Daemons
@@ -110,9 +110,6 @@
 Patch19: %{name}-%{majversion}-connectors-util-build.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{epoch}-%{version}-%{release}-root
-%if ! %{gcj_support}
-BuildArch: noarch
-%endif
 
 Buildrequires: jpackage-utils >= 0:1.7.4
 BuildRequires: java-devel >= 0:1.5.0
@@ -146,15 +143,17 @@
 BuildRequires: jakarta-taglibs-standard >= 0:1.1.0
 # formerly non-free stuff
 # jta can be provided by geronimo-jta-version-api
-BuildRequires: jta_1_0_1B_api
+BuildRequires: jta
 # jaf can be provided by classpathx-jaf
-BuildRequires: jaf_1_0_2_api
+BuildRequires: jaf
 # javamail can be provided by classpathx-mail
-BuildRequires: javamail_1_3_1_api
+BuildRequires: javamail
 Requires(post): xml-commons-jaxp-1.3-apis
 # libgcj aot-compiled native libraries
 %if %{gcj_support}
 BuildRequires: java-gcj-compat-devel
+%else
+BuildArch:     noarch
 %endif
 Requires(post): jpackage-utils >= 0:1.7.4
 Requires(post): /bin/rm
@@ -485,9 +484,9 @@
 xml-apis.jar=$(build-classpath xml-commons-jaxp-1.3-apis)
 struts.jar=$(build-classpath struts)
 struts.lib=%{_datadir}/struts
-activation.jar=$(build-classpath jaf_1_0_2_api)
-mail.jar=$(build-classpath javamail_1_3_1_api)
-jta.jar=$(build-classpath jta_1_0_1B_api)
+activation.jar=$(build-classpath jaf)
+mail.jar=$(build-classpath javamail)
+jta.jar=$(build-classpath jta)
 jaas.jar=$(build-classpath jaas)
 jndi.jar=$(build-classpath jndi)
 jdbc20ext.jar=$(build-classpath jdbc-stdext)
@@ -522,9 +521,9 @@
 commons-pool.jar=$(build-classpath commons-pool)
 regexp.jar=$(build-classpath regexp)
 jmx.jar=$(build-classpath mx4j/mx4j-jmx)
-activation.jar=$(build-classpath jaf_1_0_2_api)
-mail.jar=$(build-classpath javamail_1_3_1_api)
-jta.jar=$(build-classpath jta_1_0_1B_api)
+activation.jar=$(build-classpath jaf)
+mail.jar=$(build-classpath javamail)
+jta.jar=$(build-classpath jta)
 jaas.jar=$(build-classpath jaas)
 jndi.jar=$(build-classpath jndi)
 jdbc20ext.jar=$(build-classpath jdbc-stdext)
@@ -1349,7 +1348,10 @@
 %endif
 
 %changelog
-* Mon Oct 13 2008 David Walluck <dwalluck at redhat.com>  0:5.5.27-4.1
+* Mon Oct 13 2008 David Walluck <dwalluck at redhat.com> 0:5.5.27-4.2
+- use Fedora-specific changes to various API levels to allow building
+
+* Mon Oct 13 2008 David Walluck <dwalluck at redhat.com> 0:5.5.27-4.1
 - sync with JPackage 0:5.5.27-4
 
 * Mon Jul 14 2008 Andrew Overholt <overholt at redhat.com> 0:5.5.26-1.5