rpms/tomcat6/devel tomcat6-6.0.conf,1.1,1.2 tomcat6.spec,1.4,1.5

[David Walluck]

Author: dwalluck

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

Modified Files:
	tomcat6-6.0.conf tomcat6.spec 
Log Message:
- use Fedora-specific changes to force java 1.6.0


Index: tomcat6-6.0.conf
===================================================================
RCS file: /cvs/pkgs/rpms/tomcat6/devel/tomcat6-6.0.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tomcat6-6.0.conf	7 Apr 2008 22:37:26 -0000	1.1
+++ tomcat6-6.0.conf	13 Oct 2008 20:37:31 -0000	1.2
@@ -9,7 +9,7 @@
 #
 
 # Where your java installation lives
-#JAVA_HOME="/usr/lib/jvm/java"
+JAVA_HOME="/usr/lib/jvm/java-1.6.0"
 
 # Where your tomcat installation lives
 CATALINA_BASE="@@@TCHOME@@@"


Index: tomcat6.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tomcat6/devel/tomcat6.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- tomcat6.spec	13 Oct 2008 20:15:33 -0000	1.4
+++ tomcat6.spec	13 Oct 2008 20:37:31 -0000	1.5
@@ -52,7 +52,7 @@
 Name: tomcat6
 Epoch: 0
 Version: %{major_version}.%{minor_version}.%{micro_version}
-Release: 6.1%{?dist}
+Release: 6.2%{?dist}
 Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API
 
 Group: Networking/Daemons
@@ -77,14 +77,14 @@
 BuildRequires: findutils
 BuildRequires: jakarta-commons-collections
 BuildRequires: jakarta-commons-daemon
-BuildRequires: java-devel
+BuildRequires: java-1.6.0-devel
 BuildRequires: jpackage-utils >= 0:1.7.0
 BuildRequires: junit
 Requires(pre): shadow-utils
 Requires(pre): shadow-utils
 Requires: jakarta-commons-daemon
 Requires: jakarta-commons-logging
-Requires: java
+Requires: java-1.6.0
 Requires: procps
 Requires: %{name}-lib = %{epoch}:%{version}-%{release}
 Requires(post): /sbin/chkconfig
@@ -432,6 +432,9 @@
 %{appdir}/sample
 
 %changelog
+* Mon Oct 13 2008 David Walluck <dwalluck at redhat.com> 0:6.0.18-6.2
+- use Fedora-specific changes to force java 1.6.0
+
 * Tue Oct 07 2008 David Walluck <dwalluck at redhat.com> 0:6.0.18-6.1
 - use lsb_release instead of lsb-release to get the distributor