rpms/tomcat5/devel tomcat5-5.5.conf, 1.6, 1.7 tomcat5.spec, 1.119, 1.120

[David Walluck]

Author: dwalluck

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

Modified Files:
	tomcat5-5.5.conf tomcat5.spec 
Log Message:
- Fedora-specific changes to java requirements and to JAVA_HOME


Index: tomcat5-5.5.conf
===================================================================
RCS file: /cvs/pkgs/rpms/tomcat5/devel/tomcat5-5.5.conf,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- tomcat5-5.5.conf	13 Oct 2008 20:58:23 -0000	1.6
+++ tomcat5-5.5.conf	14 Oct 2008 15:35:16 -0000	1.7
@@ -2,7 +2,7 @@
 
 # you could also override JAVA_HOME here
 # 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
 # That change from previous RPM where TOMCAT_HOME 


Index: tomcat5.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tomcat5/devel/tomcat5.spec,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- tomcat5.spec	14 Oct 2008 15:18:45 -0000	1.119
+++ tomcat5.spec	14 Oct 2008 15:35:16 -0000	1.120
@@ -71,7 +71,7 @@
 Name: tomcat5
 Epoch: 0
 Version: %{majversion}.%{minversion}
-Release: 4.4%{dist}
+Release: 4.5%{dist}
 Summary: Apache Servlet/JSP Engine, RI for Servlet 2.4/JSP 2.0 API
 
 Group: Networking/Daemons
@@ -112,7 +112,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{epoch}-%{version}-%{release}-root
 
 Buildrequires: jpackage-utils >= 0:1.7.4
-BuildRequires: java-devel >= 0:1.5.0
+BuildRequires: java-1.6.0-devel
 BuildRequires: ant >= 0:1.6.5
 %if %{without_apisonly}
 %if %{with_ecj}
@@ -178,7 +178,7 @@
 Requires: jakarta-commons-daemon >= 1.0.1
 Requires: jakarta-commons-launcher >= 0:0.9
 # alternatives
-Requires: java-devel >= 0:1.5.0
+Requires: java-1.6.0-devel
 %if %{with_ecj}
 Requires: ecj >= 0:3.3.1.1
 Requires(post): ecj >= 0:3.3.1.1
@@ -296,7 +296,7 @@
 %package common-lib
 Group: Development/Compilers
 Summary: Libraries needed to run the Tomcat Web container (part)
-Requires: java >= 0:1.5.0
+Requires: java-1.6.0
 Requires(post): jpackage-utils >= 0:1.7.4
 Requires: jakarta-commons-collections-tomcat5 >= 0:3.1
 Requires(post): jakarta-commons-collections-tomcat5 >= 0:3.1
@@ -1348,6 +1348,9 @@
 %endif
 
 %changelog
+* Tue Oct 14 2008 David Walluck <dwalluck at redhat.com> 0:5.5.27-4.5
+- Fedora-specific changes to java requirements and to JAVA_HOME
+
 * Tue Oct 14 2008 David Walluck <dwalluck at redhat.com> 0:5.5.27-4.4
 - make patches to apply with 0 fuzz again