Mercurial > hg > release > thermostat-1.6

changeset 2043:83ded2b9af31

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Symlink thermostat-common and fix syntax error in thermostatrc. Backport of: http://icedtea.classpath.org/hg/thermostat/rev/07db2870b601 PR3238 Reviewed-by: jerboaa Review-thread: http://icedtea.classpath.org/pipermail/thermostat/2016-December/021885.html
author Jie Kang <jkang@redhat.com>
date Tue, 20 Dec 2016 15:28:47 -0500
parents f6c48c61e6de
children f04119b95df6
files distribution/packaging/fedora/thermostat.spec
diffstat 1 files changed, 5 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/distribution/packaging/fedora/thermostat.spec	Tue Dec 20 15:27:55 2016 -0500
+++ b/distribution/packaging/fedora/thermostat.spec	Tue Dec 20 15:28:47 2016 -0500
@@ -680,7 +680,7 @@
 sed -i 's|^JAVA=.*|JAVA="%{jdk_base}/bin/java"|' distribution/target/image/bin/thermostat-command-channel
 sed -i 's|^JAVA=.*|JAVA="%{jdk_base}/bin/java"|' distribution/target/image/bin/thermostat
 # Fix path to tools.jar, replace system thermostatrc
-sed 's|__TOOLS_PATH__|%{jdk_base}/lib/tools.jar"|' %{SOURCE4} > distribution/target/image/etc/thermostatrc
+sed 's|__TOOLS_PATH__|%{jdk_base}/lib/tools.jar|' %{SOURCE4} > distribution/target/image/etc/thermostatrc
 sed -i 's|^TOOLS_JAR=.*|TOOLS_JAR="%{jdk_base}/lib/tools.jar"|' distribution/target/image/bin/thermostat-agent-proxy
 sed -i 's|^TOOLS_JAR=.*|TOOLS_JAR="%{jdk_base}/lib/tools.jar"|' distribution/target/image/bin/thermostat-command-channel
 sed -i 's|^TOOLS_JAR=.*|TOOLS_JAR="%{jdk_base}/lib/tools.jar"|' distribution/target/image/bin/thermostat
@@ -820,11 +820,13 @@
 done
 popd
 
-# Symlink the thermostat script(s) in /usr/bin
+# Symlink essential thermostat script(s) in /usr/bin
 ln -s %{_datarootdir}/%{pkg_name}/bin/thermostat \
     %{buildroot}%{_bindir}/thermostat
 ln -s %{_datarootdir}/%{pkg_name}/bin/thermostat-setup \
     %{buildroot}%{_bindir}/thermostat-setup
+ln -s %{_datarootdir}/%{pkg_name}/bin/thermostat-common \
+    %{buildroot}%{_bindir}/thermostat-common
 
 # Move config files to /etc and symlink stuff under
 # $THERMOSTAT_HOME/etc to it. Put example configs
@@ -1069,6 +1071,7 @@
 %{_jnidir}/thermostat-*.jar
 %{_bindir}/thermostat
 %{_bindir}/thermostat-setup
+%{_bindir}/thermostat-common
 %{_mandir}/man1/%{pkg_name}.1*
 %if 0%{?with_systemd}
 %{_unitdir}/%{?scl_prefix}%{pkg_name}-storage.service