[thermostat/f18] Set JAVA_HOME via set_jvm
jerboaa
jerboaa at fedoraproject.org
Thu Nov 15 10:11:19 UTC 2012
commit 170a73a730ad68152bcdbec9d62c2d6a8e3f0945
Author: Severin Gehwolf <sgehwolf at redhat.com>
Date: Thu Nov 15 11:09:52 2012 +0100
Set JAVA_HOME via set_jvm
thermostat.spec | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
---
diff --git a/thermostat.spec b/thermostat.spec
index cd8d1f6..fab8e95 100644
--- a/thermostat.spec
+++ b/thermostat.spec
@@ -1,6 +1,6 @@
Name: thermostat
Version: 0.4.0
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: A monitoring and serviceability tool for OpenJDK
License: GPLv2+ with exceptions
URL: http://icedtea.classpath.org/thermostat/
@@ -106,8 +106,12 @@ This package contains the API documentation for %{name}
%patch6 -p1
%build
-# Build JNI bits
export CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_LD_FLAGS"
+# Set JAVA_HOME. make uses this
+. /usr/share/java-utils/java-functions
+set_jvm
+
+# Build JNI bits
pushd keyring
mkdir -p target/classes
javac -d target/classes src/main/java/com/redhat/thermostat/utils/keyring/Keyring.java \
@@ -248,6 +252,9 @@ cp -a target/site/apidocs %{buildroot}%{_javadocdir}/%{name}
%{_javadocdir}/%{name}
%changelog
+* Thu Nov 15 2012 Severin Gehwolf <sgehwolf at redhat.com> 0.4.0-6
+- Set JAVA_HOME via set_jvm.
+
* Wed Nov 14 2012 Severin Gehwolf <sgehwolf at redhat.com> 0.4.0-5
- Don't use maven-exec-plugin for compiling native bits.
More information about the scm-commits
mailing list