提交 c5bc4721 编写于 作者: O Olav Reinert

[FIXED JENKINS-8748]: openSUSE: required JDK

For openSUSE it doesn't make sense to require a specific flavor of JRE
for Jenkins. Even if the RPM explicitly requires the Oracle JDK, thus
causing it to be installed together with Jenkins, some previously installed
JRE may still be used to run Jenkins, due to the update-alternatives(8) setting.
The JRE to use is a sysadmin issue, and not usually part of the RPM spec.

I have not been able to reproduce the scenario described by David.
Installing Jenkins on fresh installs of openSUSE since v11.1 pulls in openJDK
1.6 with it, with which Jenkins runs just fine. Even on Live CDs.
上级 3bd3ff9b
......@@ -13,10 +13,11 @@ JENKINS_HOME="@@HOME@@"
## Default: ""
## ServiceRestart: jenkins
#
# Java executable to run Jenkins
# When left empty, we'll try to find the suitable Java.
# Java runtime to run Jenkins
# When left empty, the current system default JRE, as defined
# by update-alternatives(8), is used.
#
JENKINS_JAVA_CMD=""
JENKINS_JAVA_HOME=""
## Type: string
## Default: "jenkins"
......
......@@ -29,7 +29,7 @@ BuildRoot: %{_tmppath}/build-%{name}-%{version}
# provides >= 1.6.0 must specify the epoch, "java >= 1:1.6.0".
#
# java-1_6_0-sun provides this at least
Requires: java-sun >= 1.6.0
Requires: java >= 1.6
Obsoletes: hudson
PreReq: /usr/sbin/groupadd /usr/sbin/useradd
#PreReq: %{fillup_prereq}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册