update to 3.4.9

this incorporates upstream fixes to lnet_stats sampler and init scripts.

toss3.unstable/firerpms

@@ -1,12 +1,12 @@
-#!/bin/bash -x
+#!/bin/bash
 #
 #
 packing=toss3.unstable
-ovis_branch=OVIS-3.4.6-dstat-fix
+ovis_branch=v3.4.9
 sos_branch=master
 NetworkRequires=github.com
 #[email protected]:tom/SOS.git
-[email protected]:baallan/ovis.git
+[email protected]:ovis/ovis.git
 
 if test -n "$MODULEPATH"; then
 	module purge
@@ -41,7 +41,7 @@ IFACE_OPTS="
 --enable-swig
 --disable-readline
 --enable-ldms-python
---disable-python
+--enable-python
 --enable-libgenders
 --enable-genderssystemd
 "
@@ -53,7 +53,7 @@ STORE_OPTS="
 --enable-flatfile
 --enable-csv
 --enable-store
---disable-rabbitv3
+--enable-rabbitkw
 "
 SAMPLER_OPTS="
 --disable-cray_power_sampler

toss3.unstable/ovis.spec.in

@@ -41,6 +41,7 @@ Requires: libevent >= 2.0.21
 @ENABLE_LIBGENDERS_TRUE@Requires: genders
 @ENABLE_SYSCLASSIB_TRUE@Requires: libibmad libibumad
 @ENABLE_RDMA_TRUE@Requires: librdmacm libibverbs
+@ENABLE_RABBITKW_TRUE@Requires: librabbitmq librabbitmq-devel
 
 BuildRequires: gettext-devel gcc glib2-devel
 @ENABLE_DOC_TRUE@BuildRequires: doxygen
@@ -53,6 +54,7 @@ BuildRequires: libevent libevent-devel
 @ENABLE_SWIG_TRUE@BuildRequires: swig
 @ENABLE_LIBGENDERS_TRUE@BuildRequires: boost-devel
 @ENABLE_LIBGENDERS_TRUE@BuildRequires: genders
+@ENABLE_RABBITKW_TRUE@BuildRequires: librabbitmq librabbitmq-devel
 Url: http://ovis.ca.sandia.gov/
 
 # relocation prefix0 for file installs other than sysconfdir & localstatedir
@@ -463,6 +465,8 @@ bash $RPM_INSTALL_PREFIX0/share/doc/ovis-@VERSION@/relocation/relocate-paths.sh
 	$RPM_INSTALL_PREFIX0/share/doc/ovis-@VERSION@/relocation/manifest
 
 %changelog
+* Wed Jul 25 2018 Ben Allan <[email protected]> 3.4.8-1
+Config support of store_rabbitkw.
 * Thu Apr 19 2018 Ben Allan <[email protected]> 3.4.6-0
 SOS/baler v3 deprecation. Wrapper file for sbin exec relocation support.
 * Wed Oct 18 2017 Ben Allan <[email protected]> 3.4.4-4

toss3/firerpms

@@ -2,7 +2,7 @@
 #
 #
 packing=toss3
-ovis_branch=v3.4.8
+ovis_branch=v3.4.9
 sos_branch=master
 NetworkRequires=github.com
 #[email protected]:tom/SOS.git