[wallaby/f19] updated to 0.16.4

[William Christian Benton]

commit b81d1c14f7cd0fc333b54265d40320a57b2ade20
Author: William Benton <willb at redhat.com>
Date:   Thu Oct 17 12:19:29 2013 -0500

    updated to 0.16.4

 .gitignore                           |    1 +
 0001-updated-spec-for-0.16.0.patch   |   27 ------------------------
 0001-updated-spec-for-0.16.3-1.patch |   26 -----------------------
 sources                              |    2 +-
 wallaby.spec                         |   37 +++++++++++++++++++++------------
 5 files changed, 25 insertions(+), 68 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3f7fd5c..9876909 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /wallaby-0.12.4.tar.gz
 /wallaby-0.16.0.tar.gz
 /wallaby-0.16.3.tar.gz
+/wallaby-0.16.4.tar.gz
diff --git a/sources b/sources
index 3631d42..4323c78 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8ba1c34462593f61381269bacbd88047  wallaby-0.16.3.tar.gz
+4f5df69f3e1e8d69949a609eb5699807  wallaby-0.16.4.tar.gz
diff --git a/wallaby.spec b/wallaby.spec
index 4d2cb1f..d047d9c 100644
--- a/wallaby.spec
+++ b/wallaby.spec
@@ -22,7 +22,7 @@
 %global has_sinatra 0
 %endif
 
-%if (0%{?fedora} >= 17) || 0%{?rhel} >= 7
+%if (0%{?fedora} >= 17)
 %global ruby_abi 1.9.1
 %global ruby_appropriate_install_dir %{ruby_vendorlibdir}
 %global requires_ruby_devel 1
@@ -33,25 +33,36 @@
 %global ruby_appropriate_install_dir %{ruby_sitelib}
 %endif
 
+%if 0%{?fedora} >= 19 || 0%{?rhel} >= 7
+%global ruby_runtime ruby(release)
+%else
+%global ruby_runtime ruby(abi) = %{?ruby_abi}
+%endif
+
+
 %if %{building_for_el5} == 1
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %endif
 
+
+
 Summary: HTCondor pool configuration service with QMF interface
 Name: wallaby
-Version: 0.16.3
-Release: 3%{?dist}
+Version: 0.16.4
+Release: 1%{?dist}
 Group: Applications/System
 License: ASL 2.0
 URL: http://git.fedorahosted.org/git/grid/wallaby.git
 Source0: https://fedorahosted.org/releases/g/r/grid/%{name}-%{version}.tar.gz
-Patch0: 0001-updated-spec-for-0.16.3-1.patch
+
 %if %{building_for_el5}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 %endif
 BuildRequires: python2-devel
-Requires: ruby(release)
+
+Requires: %{ruby_runtime}
+
 BuildRequires: ruby
 Requires: ruby-qpid-qmf >= 0.7.929717
 Requires: ruby-spqr >= 0.3.6
@@ -83,7 +94,7 @@ and manages multiple versions of configurations.
 %package utils
 Summary: Utilities to interact with the Wallaby service
 Group: Applications/System
-Requires: ruby(release) = %{?ruby_abi}
+Requires: %{ruby_runtime}
 Requires: ruby-qpid-qmf >= 0.7.929717
 Requires: ruby-wallaby = %{version}
 
@@ -94,7 +105,7 @@ and node configurations and interacting with the Wallaby service.
 %package -n ruby-wallaby
 Summary: Wallaby implementation libraries, API, and client library
 Group: Applications/System
-Requires: ruby(release) = %{?ruby_abi}
+Requires: %{ruby_runtime}
 Requires: ruby-irb
 Requires: ruby-qpid-qmf >= 0.7.929717
 Requires: ruby-spqr >= 0.3.5
@@ -119,7 +130,7 @@ that interact with the Wallaby configuration service over QMF.
 %package -n wallaby-http-server
 Summary: Wallaby web service interface
 Group: Applications/System
-Requires: ruby(release) = %{?ruby_abi}
+Requires: %{ruby_runtime}
 Requires: ruby-irb
 Requires: ruby-qpid-qmf >= 0.7.929717
 Requires: ruby-wallaby = %{version}-%{release}
@@ -141,7 +152,6 @@ Wallaby.
 %prep
 %setup -q
 
-%patch0 -p1
 %build
 
 sed 's/^export //' < etc/sysconfig/wallaby-agent > etc/sysconfig/wallaby-agent-env
@@ -289,11 +299,10 @@ fi
 
 %changelog
 
-* Fri Oct 4 2013 willb <willb at redhat> - 0.16.3-3
-- Fixes spurious ruby(abi) dep introduced in last merge
-
-* Fri Oct 4 2013 willb <willb at redhat> - 0.16.3-2
-- Fixes broken dependency on ruby-qmf
+* Sat Oct 5 2013 willb <willb at redhat> - 0.16.4-1
+- Fixes issues related to case-insensitivity of parameter names
+- Fixes issues with inventory constraints on 32-bit systems
+- Fixes packaging issues on contemporary Fedora releases
 
 * Mon Jan 7 2013 willb <willb at redhat> - 0.16.3-1
 - Fixes edge cases reported in BZ 802821