Mercurial > hg > release > thermostat-2.0

changeset 2555:e7e190503d38

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use /usr/lib/jvm/java as jdk base when building rpm Reviewed-by: jerboaa Review-thread: http://icedtea.classpath.org/pipermail/thermostat/2017-January/021955.html
author Jie Kang <jkang@redhat.com>
date Fri, 13 Jan 2017 10:18:18 -0500
parents 45c6d9e60653
children 252478620e7a
files distribution/packaging/fedora/thermostat.spec
diffstat 1 files changed, 2 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/distribution/packaging/fedora/thermostat.spec	Tue Jan 10 11:00:14 2017 +0100
+++ b/distribution/packaging/fedora/thermostat.spec	Fri Jan 13 10:18:18 2017 -0500
@@ -136,15 +136,8 @@
 %global jgraphx_bundle_version     3.6.0
 
 # Base path to the JDK which will be used in boot scripts
-%if 0%{?fedora} >= 22
-  %global jdk_base /etc/alternatives/java_sdk_openjdk
-%else
-  %if 0%{?is_rhel_6}
-    %global jdk_base /usr/lib/jvm/java-1.7.0-openjdk.x86_64
-  %else
-    %global jdk_base /usr/lib/jvm/java-1.7.0-openjdk
-  %endif
-%endif 
+# This link is managed by alternatives
+%global jdk_base /usr/lib/jvm/java
 
 %{?scl:%scl_package thermostat}
 %{!?scl:%global pkg_name %{name}}