[thermostat] Fix broken symlinks in %{_jnidir}. See RHBZ#889187.

[jerboaa]

commit 882b1a867b51c320f4c1e4c068b39def6a9ee630
Author: Severin Gehwolf <sgehwolf at redhat.com>
Date:   Thu Dec 20 16:02:59 2012 +0100

    Fix broken symlinks in %{_jnidir}. See RHBZ#889187.

 thermostat.spec |   22 ++++++++++++++--------
 1 files changed, 14 insertions(+), 8 deletions(-)
---
diff --git a/thermostat.spec b/thermostat.spec
index b55daa2..e023164 100644
--- a/thermostat.spec
+++ b/thermostat.spec
@@ -1,8 +1,10 @@
 %global hgrev d6145521e208
+# Set to true for mvn-rpmbuild resolver debug output
+%global maven_debug_flag false
 
 Name:       thermostat
 Version:    0.5.0
-Release:    0.23.20121123hg%{hgrev}%{?dist}
+Release:    0.24.20121123hg%{hgrev}%{?dist}
 Summary:    A monitoring and serviceability tool for OpenJDK
 License:    GPLv2+ with exceptions
 URL:        http://icedtea.classpath.org/thermostat/
@@ -150,7 +152,7 @@ popd
 mvn-rpmbuild \
      -Dmaven.test.skip=true \
      -Dthermostat.home=%{_datarootdir}/%{name} \
-     -Dmaven.local.debug=true \
+     -Dmaven.local.debug=%{maven_debug_flag} \
      install javadoc:aggregate
 
 # the build puts all depdency jars into distribution/target/lib as well
@@ -176,6 +178,13 @@ mkdir -p %{buildroot}%{_libdir}/%{name}
 mkdir -p %{buildroot}%{_jnidir}
 
 pushd distribution/target/libs
+# JNI jars need to be in %{_jnidir}, we symlink to
+# %{_libdir}/%{name} files. Files are moved to
+# %{_libdir}/%{name} next.
+for i in thermostat-keyring-%{version}*.jar \
+    thermostat-agent-core-%{version}*.jar; do
+  ln -s %{_libdir}/%{name}/$i %{buildroot}%{_jnidir}/$i
+done
 # JNI files are in %{_libdir}
 mv thermostat-keyring-%{version}*.jar \
    thermostat-agent-core-%{version}*.jar \
@@ -184,12 +193,6 @@ mv thermostat-keyring-%{version}*.jar \
 # generated
 chmod +x native/*.so
 mv native/* %{buildroot}%{_libdir}/%{name}
-# JNI jars need to be in %{_jnidir}, we symlink to
-# %{_libdir}/%{name} files
-for i in thermostat-keyring-%{version}*.jar \
-    thermostat-agent-core-%{version}*.jar; do
-  ln -s %{_libdir}/%{name}/$i %{buildroot}%{_jnidir}/$i
-done
 popd
 
 # move everything else into /usr/share/thermostat
@@ -294,6 +297,9 @@ cp -a target/site/apidocs %{buildroot}%{_javadocdir}/%{name}
 %{_javadocdir}/%{name}
 
 %changelog
+* Thu Dec 20 2012 Severin Gehwolf <sgehwolf at redhat.com> 0.5.0-0.24.20121123hgd6145521e208
+- Fix broken symlinks in %{_jnidir}. See RHBZ#889187.
+
 * Wed Dec 19 2012 Stanislav Ochotnicky <sochotnicky at redhat.com> - 0.5.0-0.23.20121123hgd6145521e208
 - revbump after jnidir change