[thermostat/f21] Fix thermostat runtime issues.

[jerboaa]

commit 25ce1d48724b99a80e93ef86662338abfe966fb3
Author: Severin Gehwolf <sgehwolf at redhat.com>
Date:   Thu Sep 4 16:59:16 2014 +0200

    Fix thermostat runtime issues.
    
    The hawtjni-runtime symlink was broken and in F21 there won't be any
    OpenJDK 7. Use OpenJDK 8 instead. Fix R/BRs to use
    java-1.8.0-openjdk{,-devel}.

 thermostat.spec |   19 ++++++++++++-------
 1 files changed, 12 insertions(+), 7 deletions(-)
---
diff --git a/thermostat.spec b/thermostat.spec
index e62b690..6110c9b 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.7.0-openjdk
+%global jdk_base /usr/lib/jvm/java-1.8.0-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.2%{?dist}
+Release:    4.3%{?dist}
 Summary:    A monitoring and serviceability tool for OpenJDK
 License:    GPLv2+ with exceptions and OFL
 URL:        http://icedtea.classpath.org/thermostat/
@@ -127,7 +127,7 @@ Patch3:     ignore_bundle_versions.patch
 Patch4:     update-to-lucene-4.7.0.patch
 
 # BRs for core thermostat
-BuildRequires:  java-devel >= 1:1.7.0
+BuildRequires:  java-devel >= 1:1.8.0
 BuildRequires:  jpackage-utils
 BuildRequires: maven-local
 # Explicitly require xmvn >= 0.4.2-1.1 Otherwise
@@ -191,9 +191,9 @@ BuildRequires: osgi(org.apache.httpcomponents.httpcore) = %{hc_core_bundle_versi
 BuildRequires: osgi(org.apache.httpcomponents.httpclient) = %{hc_client_bundle_version}
 BuildRequires: osgi(org.apache.httpcomponents.httpmime) = %{hc_client_bundle_version}
 
-Requires: java >= 1:1.7.0
+Requires: java >= 1:1.8.0
 Requires: jpackage-utils
-Requires: java-devel >= 1:1.7.0
+Requires: java-devel >= 1:1.8.0
 Requires: mongodb-server
 Requires: libgnome-keyring
 Requires(post): systemd
@@ -456,7 +456,8 @@ mv distribution/target/image/libs/thermostat-*jar .
 rm -f distribution/target/image/libs/*jar
 mv thermostat-*jar distribution/target/image/libs/
 
-# Need Java 7 in in scripts
+# Make path to java so that it keeps working after updates.
+# We require java >= 1.7.0
 sed -i 's|^JAVA=.*|JAVA="%{jdk_base}/bin/java"|' distribution/target/image/bin/thermostat
 sed -i 's|^JAVA=.*|JAVA="%{jdk_base}/bin/java"|' distribution/target/image/bin/thermostat-agent-proxy
 # Fix path to tools.jar
@@ -573,7 +574,7 @@ cp -a distribution/target/image %{buildroot}%{thermostat_home}
 
 # symlink dependencies into the right directory
 ln -s %{system_javadir}/felix/org.apache.felix.framework.jar %{buildroot}%{thermostat_home}/libs/org.apache.felix.framework.jar
-ln -s %{system_javadir}/hawtjni/hawtjni-runtime.jar %{buildroot}%{thermostat_home}/libs/hawtjni-runtime.jar
+ln -s $(build-classpath hawtjni/hawtjni-runtime.jar) %{buildroot}%{thermostat_home}/libs/hawtjni-runtime.jar
 # All bundles with symbolic_name=version listed in
 # $THERMOSTAT_HOME/etc/commands/<command>.properties or any thermostat-plugin.xml file
 # need to be symlinked from $THERMOSTAT_HOME/{libs,plugins/<plugin-name>/}
@@ -848,6 +849,10 @@ end
 %config(noreplace) %{system_confdir}/sysconfig/tomcat@%{pkg_name}
 
 %changelog
+* Thu Sep 04 2014 Severin Gehwolf <sgehwolf at redhat.com> - 1.0.4-4.3
+- Fix hawtjni-runtime symlink and use OpenJDK 8 in
+  scripts, R/BRs.
+
 * Tue Sep 02 2014 Severin Gehwolf <sgehwolf at redhat.com> - 1.0.4-4.2
 - Rebuild for updated jcommon/jfreechart versions.