[thermostat/f17] A number of major and minor fixes

[Omair Majid]

commit 0c0e365a87ccbf5aa0a67b73cca9a5a6f4881bfe
Author: Omair Majid <omajid at redhat.com>
Date:   Sun May 6 19:19:06 2012 -0400

    A number of major and minor fixes
    
    - Resolve RH813539
    - Remove uneeded require on fusesource-pom
    - Fix jar to use jline2 instead of jline

 thermostat.spec |   14 +++++++++++---
 1 files changed, 11 insertions(+), 3 deletions(-)
---
diff --git a/thermostat.spec b/thermostat.spec
index 9bc6006..8e96699 100644
--- a/thermostat.spec
+++ b/thermostat.spec
@@ -2,7 +2,7 @@
 
 Name:       thermostat
 Version:    0.2
-Release:    0.20120503hg%{changeset}%{?dist}
+Release:    0.20120506hg%{changeset}%{?dist}
 Summary:    A monitoring and serviceability tool for OpenJDK
 License:    GPLv2+ with exceptions
 URL:        http://icedtea.classpath.org/thermostat/
@@ -31,7 +31,6 @@ BuildRequires: mongo-java-driver-bson
 Requires: java >= 1:1.7.0
 Requires: jpackage-utils
 
-Requires: fusesource-pom
 Requires: jansi
 Requires: java-devel >= 1:1.7.0
 Requires: jline2
@@ -75,6 +74,10 @@ mv distribution/target/libs/thermostat-*jar .
 rm -f distribution/target/libs/*jar
 mv thermostat-*jar distribution/target/libs/
 
+# fix path to java in scripts
+sed -i 's|^JAVA=.*|JAVA="/usr/lib/jvm/java-openjdk/jre/bin/java"|' distribution/target/bin/thermostat
+sed -i 's|^JAVA=.*|JAVA="/usr/lib/jvm/java-openjdk/jre/bin/java"|' distribution/target/bin/thermostat-client-gui
+
 %install
 mkdir -p %{buildroot}%{_bindir}
 mkdir -p %{buildroot}%{_sysconfdir}/%{name}
@@ -90,7 +93,7 @@ build-jar-repository -s -p %{buildroot}%{_datarootdir}/%{name}/libs \
     jansi \
     jcommon \
     jfreechart \
-    jline \
+    jline2 \
     mongo
 
 ln -s /usr/lib/jvm/java-openjdk/lib/tools.jar \
@@ -136,6 +139,11 @@ cp -a target/site/apidocs %{buildroot}%{_javadocdir}/%{name}
 %{_javadocdir}/%{name}
 
 %changelog
+* Sun May 06 2012 Omair Majid <omajid at redhat.com> - 0.2-0.20120506hg2140a7c81a4b
+- Resolve RH813539
+- Remove uneeded require on fusesource-pom
+- Fix jar to use jline2 instead of jline
+
 * Fri May 04 2012 Omair Majid <omajid at redhat.com> - 0.2-0.20120503hg2140a7c81a4b
 - Update to pre-release upstream snapshot