[thermostat] Rebuild for xmvn-subst to symlink thermostat jars.

[jerboaa]

commit 67781c3213247837fc32100e7dd6d156e8a2ddd2
Author: Severin Gehwolf <sgehwolf at redhat.com>
Date:   Fri Jan 23 16:39:20 2015 +0100

    Rebuild for xmvn-subst to symlink thermostat jars.
    
    - Added BR on thermostat

 thermostat.spec |   18 +++++++++++-------
 1 files changed, 11 insertions(+), 7 deletions(-)
---
diff --git a/thermostat.spec b/thermostat.spec
index 9e644e5..38ff9f2 100644
--- a/thermostat.spec
+++ b/thermostat.spec
@@ -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:    2%{?dist}
+Release:    3%{?dist}
 Summary:    A monitoring and serviceability tool for OpenJDK
 License:    GPLv2+ with exceptions and OFL
 URL:        http://icedtea.classpath.org/thermostat/
@@ -122,14 +122,13 @@ Patch3:     fix_lucene_symbolic_name.patch
 # FIXME: Propose upstream
 Patch4:     fix_assembly_filtering.patch
 
+# Self-BR in order for xmvn-subst to work for symlinking
+# thermostat deps.
+BuildRequires: thermostat-webapp = %{version}
 # BRs for core thermostat
-BuildRequires:  java-devel >= 1:1.8.0
-BuildRequires:  jpackage-utils
+BuildRequires: java-devel >= 1:1.8.0
+BuildRequires: javapackages-tools
 BuildRequires: maven-local
-# Explicitly require xmvn >= 0.4.2-1.1 Otherwise
-# config for skipping installation of the war module will not work.
-# See RHBZ#963838
-BuildRequires: xmvn >= 0.4.2-1.1
 BuildRequires: maven-dependency-plugin
 BuildRequires: maven-surefire-plugin
 BuildRequires: maven-war-plugin
@@ -768,6 +767,11 @@ end
 %config(noreplace) %{system_confdir}/sysconfig/tomcat@%{pkg_name}
 
 %changelog
+* Fri Jan 23 2015 Severin Gehwolf <sgehwolf at redhat.com> - 1.2.0-3
+- BR thermostat in order for xmvn-subst to properly generate
+  symlinks to own jars. Using jars from same reactor does not yet
+  work.
+
 * Thu Jan 22 2015 Severin Gehwolf <sgehwolf at redhat.com> - 1.2.0-2
 - Clean up spec file and make it buildable.