[thermostat/f21] Use /etc/alternatives/java_sdk_openjdk as jdk_base

jerboaa jerboaa at fedoraproject.org
Tue Oct 14 14:50:21 UTC 2014


commit a414c6a83a785ac58467173aaa4623a813d1c9ab
Author: Severin Gehwolf <sgehwolf at redhat.com>
Date:   Mon Oct 13 15:58:05 2014 +0200

    Use /etc/alternatives/java_sdk_openjdk as jdk_base
    
    Note this can only be used on Fedora since there is only one OpenJDK
    version. For other distros this might point to a 6 JDK which won't
    work.
    
    Reviewed-by: Omair Majid <omajid at redhat.com>

 thermostat.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/thermostat.spec b/thermostat.spec
index 5e43711..bec62a5 100644
--- a/thermostat.spec
+++ b/thermostat.spec
@@ -28,7 +28,7 @@
 %global is_scl_build %( test -n "$(rpm --eval '%{?scl}')" && echo 1 || echo 0)
 
 # Base path to the JDK which will be used in boot scripts
-%global jdk_base /usr/lib/jvm/java-1.8.0-openjdk
+%global jdk_base /etc/alternatives/java_sdk_openjdk
 
 %{?scl:%scl_package thermostat}
 %{!?scl:%global pkg_name %{name}}
@@ -80,7 +80,7 @@ Name:       %{?scl_prefix}thermostat
 Version:    %{major}.%{minor}.%{patchlevel}
 # If building from snapshot out of hg, uncomment and adjust below value as appropriate
 #Release:    0.1.20131122hg%{hgrev}%{?dist}
-Release:    4.4%{?dist}
+Release:    4.5%{?dist}
 Summary:    A monitoring and serviceability tool for OpenJDK
 License:    GPLv2+ with exceptions and OFL
 URL:        http://icedtea.classpath.org/thermostat/
@@ -844,6 +844,9 @@ end
 %config(noreplace) %{system_confdir}/sysconfig/tomcat@%{pkg_name}
 
 %changelog
+* Mon Oct 13 2014 Severin Gehwolf <sgehwolf at redhat.com> - 1.0.4-4.5
+- Use /etc/alternatives/java_sdk_openjdk as jdk_base.
+
 * Mon Oct 13 2014 Severin Gehwolf <sgehwolf at redhat.com> - 1.0.4-4.4
 - Remove obsolete requires on gnome-icon-theme.
 


More information about the scm-commits mailing list