rpms/tomcat
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- use Fedora-specific changes to force java 1.6.0

Browse Source
This commit is contained in:
dwalluck 2008-10-13 20:37:31 +00:00
parent 41ff5cd14d
commit a2e53886a1
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tomcat6-6.0.conf
View File

@ -9,7 +9,7 @@
# #
# Where your java installation lives # 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 # Where your tomcat installation lives
CATALINA_BASE="@@@TCHOME@@@" CATALINA_BASE="@@@TCHOME@@@"

9
tomcat6.spec
View File

@ -52,7 +52,7 @@
Name: tomcat6 Name: tomcat6
Epoch: 0 Epoch: 0
Version: %{major_version}.%{minor_version}.%{micro_version} 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 Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API
Group: Networking/Daemons Group: Networking/Daemons
@ -77,14 +77,14 @@ BuildRequires: ecj
BuildRequires: findutils BuildRequires: findutils
BuildRequires: jakarta-commons-collections BuildRequires: jakarta-commons-collections
BuildRequires: jakarta-commons-daemon BuildRequires: jakarta-commons-daemon
BuildRequires: java-devel BuildRequires: java-1.6.0-devel
BuildRequires: jpackage-utils >= 0:1.7.0 BuildRequires: jpackage-utils >= 0:1.7.0
BuildRequires: junit BuildRequires: junit
Requires(pre): shadow-utils Requires(pre): shadow-utils
Requires(pre): shadow-utils Requires(pre): shadow-utils
Requires: jakarta-commons-daemon Requires: jakarta-commons-daemon
Requires: jakarta-commons-logging Requires: jakarta-commons-logging
Requires: java Requires: java-1.6.0
Requires: procps Requires: procps
Requires: %{name}-lib = %{epoch}:%{version}-%{release} Requires: %{name}-lib = %{epoch}:%{version}-%{release}
Requires(post): /sbin/chkconfig Requires(post): /sbin/chkconfig
@ -432,6 +432,9 @@ fi
%{appdir}/sample %{appdir}/sample
%changelog %changelog
* Mon Oct 13 2008 David Walluck <dwalluck@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@redhat.com> 0:6.0.18-6.1 * Tue Oct 07 2008 David Walluck <dwalluck@redhat.com> 0:6.0.18-6.1
- use lsb_release instead of lsb-release to get the distributor - use lsb_release instead of lsb-release to get the distributor