Mercurial > hg > release > thermostat-1.6

changeset 2046:7a19d9e8fb9b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use /usr/lib/jvm/java for jdk base when building rpm. PR3283 Reviewed-by: jerboaa Review-thread: http://icedtea.classpath.org/pipermail/thermostat/2017-January/021981.html
author Jie Kang <jkang@redhat.com>
date Tue, 17 Jan 2017 09:51:10 -0500
parents fdb31d869bf9
children 5d1964a7bf75
files distribution/packaging/fedora/thermostat.spec
diffstat 1 files changed, 1 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/distribution/packaging/fedora/thermostat.spec	Fri Jan 13 12:41:31 2017 -0500
+++ b/distribution/packaging/fedora/thermostat.spec	Tue Jan 17 09:51:10 2017 -0500
@@ -113,15 +113,7 @@
 
 
 # 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 
+%global jdk_base /usr/lib/jvm/java
 
 %{?scl:%scl_package thermostat}
 %{!?scl:%global pkg_name %{name}}