[wallaby/f18] updated spec

[William Benton]

commit f2539de667efb0ad1d195764bafab1656706c8ba
Author: William Benton <willb at redhat.com>
Date:   Thu Feb 13 07:35:34 2014 -0600

    updated spec

 wallaby.spec |   61 +++++++++++++++++++++++++++++----------------------------
 1 files changed, 31 insertions(+), 30 deletions(-)
---
diff --git a/wallaby.spec b/wallaby.spec
index d808b94..5c7a706 100644
--- a/wallaby.spec
+++ b/wallaby.spec
@@ -1,4 +1,4 @@
-%if 0%{?fedora} >= 15
+%if 0%{?fedora} >= 18
 %global want_systemd 1
 %global wallaby_agent_environment sysconfig/wallaby-agent-env
 %else
@@ -33,6 +33,13 @@
 %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))")}
@@ -42,18 +49,20 @@
 
 Summary: HTCondor pool configuration service with QMF interface
 Name: wallaby
-Version: 0.16.3
-Release: 3%{?dist}
+Version: 0.16.4
+Release: 2%{?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
+Patch0: 0001-new-systemd-macros-BZ850363.patch
 %if %{building_for_el5}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 %endif
 BuildRequires: python2-devel
-Requires: ruby(abi) = %{?ruby_abi}
+
+Requires: %{ruby_runtime}
+
 BuildRequires: ruby
 Requires: ruby-qpid-qmf >= 0.7.929717
 Requires: ruby-spqr >= 0.3.6
@@ -61,10 +70,10 @@ Requires: ruby-rhubarb >= 0.4.3
 Requires: ruby-wallaby = %{version}-%{release}
 Requires: logrotate >= 0.3
 %if %{want_systemd}
-Requires(post): systemd-units
-Requires(preun): systemd-units
-Requires(postun): systemd-units
-BuildRequires: systemd-units
+Requires(post): systemd
+Requires(preun): systemd
+Requires(postun): systemd
+BuildRequires: systemd
 %else
 Requires(post): chkconfig
 Requires(preun): chkconfig
@@ -85,7 +94,7 @@ and manages multiple versions of configurations.
 %package utils
 Summary: Utilities to interact with the Wallaby service
 Group: Applications/System
-Requires: ruby(abi) = %{?ruby_abi}
+Requires: %{ruby_runtime}
 Requires: ruby-qpid-qmf >= 0.7.929717
 Requires: ruby-wallaby = %{version}
 
@@ -96,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(abi) = %{?ruby_abi}
+Requires: %{ruby_runtime}
 Requires: ruby-irb
 Requires: ruby-qpid-qmf >= 0.7.929717
 Requires: ruby-spqr >= 0.3.5
@@ -121,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(abi) = %{?ruby_abi}
+Requires: %{ruby_runtime}
 Requires: ruby-irb
 Requires: ruby-qpid-qmf >= 0.7.929717
 Requires: ruby-wallaby = %{version}-%{release}
@@ -224,24 +233,14 @@ exit 0
 
 %if %{want_systemd}
 %post
-if [ $1 -eq 1 ] ; then 
-    # Initial installation 
-    /bin/systemctl daemon-reload >/dev/null 2>&1 || :
-fi
+%systemd_post wallaby.service
 
 %preun
-if [ $1 -eq 0 ] ; then
-    # Package removal, not upgrade
-    /bin/systemctl --no-reload disable wallaby.service > /dev/null 2>&1 || :
-    /bin/systemctl stop wallaby.service > /dev/null 2>&1 || :
-fi
+%systemd_preun wallaby.service
 
 %postun
-/bin/systemctl daemon-reload >/dev/null 2>&1 || :
-if [ $1 -ge 1 ] ; then
-    # Package upgrade, not uninstall
-    /bin/systemctl try-restart wallaby.service >/dev/null 2>&1 || :
-fi
+%systemd_postun_with_restart wallaby.service
+
 %else
 %post
 # This adds the proper /etc/rc*.d links for the script
@@ -291,11 +290,13 @@ fi
 
 %changelog
 
-* Fri Oct 4 2013 willb <willb at redhat> - 0.16.3-3
-- Fixes broken dependency on ruby-qmf (for real this time)
+* Thu Feb 13 2014 willb <willb at redhat> - 0.16.4-2
+- uses new-style systemd macros (BZ850363)
 
-* 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