From 9bc1d9d24b6b9e237d97d7ab2ec2e0a14ed1a501 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Apr 26 2017 09:00:41 +0000
Subject: import rh-thermostat16-2.3-70.7.el7


---

diff --git a/SPECS/rh-thermostat16.spec b/SPECS/rh-thermostat16.spec
index 8fdbb8b..a477b39 100644
--- a/SPECS/rh-thermostat16.spec
+++ b/SPECS/rh-thermostat16.spec
@@ -29,7 +29,7 @@ Version:    2.3
 # 60.X where X is an increasing int. 60 for EL-6. We use
 # 70.X for EL-7. For some reason we cannot rely on the
 # dist tag.
-Release:    %{custom_release}.6%{?dist}
+Release:    %{custom_release}.7%{?dist}
 Summary:    Package that installs %{scl}
 
 License:    GPLv2+
@@ -105,8 +105,7 @@ export PATH="%{_bindir}:\${PATH:-/bin:/usr/bin}"
 export MANPATH="%{_mandir}:\${MANPATH}"
 
 # Needed by Java Packages Tools to locate java.conf
-export JAVACONFDIRS="%{_sysconfdir}/java:\${JAVACONFDIRS:-/etc/java}"
-
+export JAVACONFDIRS="%{_sysconfdir}/java\${JAVACONFDIRS:+:}\${JAVACONFDIRS:-}"
 # Required by XMvn to locate its configuration file(s)
 export XDG_CONFIG_DIRS="%{_sysconfdir}/xdg:\${XDG_CONFIG_DIRS:-/etc/xdg}"
 
@@ -319,6 +318,13 @@ install -p -m 644 macros.%{scl_name_base}-scldevel %{buildroot}%{_root_sysconfdi
 
 
 %changelog
+* Wed Jan 18 2017 Jie Kang <jkang@redhat.com> - 2.3-7
+- Switch back to version 2.3 and bump release for
+  RHSCL 2.4 rebuild
+
+* Wed Jan 11 2017 Jie Kang <jkang@redhat.com> - 2.4-1
+- Fix definition of JAVACONFDIRS. Resolves rhbz#1395260
+
 * Tue Sep 06 2016 Jie Kang <jkang@redhat.com> - 2.3-6
 - Own in-collection directory. Resolves RHBZ#1371518