BZ850363

updated spec
0.16.3-3
2014-02-13 07:36:48 -06:00 · 2014-02-13 07:35:34 -06:00 · 2013-10-04 09:15:30 -05:00 · 2013-10-04 09:00:09 -05:00 · 2013-06-20 21:14:49 -05:00 · 2012-08-14 15:07:04 -05:00
5 changed files with 267 additions and 84 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1 +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
--- a/0001-new-systemd-macros-BZ850363.patch
+++ b/0001-new-systemd-macros-BZ850363.patch
@ -0,0 +1,76 @@
+From 635555319326e48d07d0dca8f9e7bc39c122a1af Mon Sep 17 00:00:00 2001
+From: William Benton <self@willbenton.com>
+Date: Thu, 13 Feb 2014 07:29:40 -0600
+Subject: [PATCH] new systemd macros; BZ850363
+
+---
+ wallaby.spec.in | 31 ++++++++++++-------------------
+ 1 file changed, 12 insertions(+), 19 deletions(-)
+
+diff --git a/wallaby.spec.in b/wallaby.spec.in
+index bf5f55c..35960a2 100644
+--- a/wallaby.spec.in
+++ b/wallaby.spec.in
+@@ -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
+@@ -70,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
+@@ -233,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
+@@ -300,6 +290,9 @@ fi
+ 
+ %changelog
+ 
+* Thu Feb 13 2014 willb <willb@redhat> - 0.16.4-2
+- uses new-style systemd macros (BZ850363)
+
+ * Sat Oct 5 2013 willb <willb@redhat> - 0.16.4-1
+ - Fixes issues related to case-insensitivity of parameter names
+ - Fixes issues with inventory constraints on 32-bit systems
+-- 
+1.8.3.1
+
--- a/0001-updated-spec-for-0.12.4.patch
+++ b/0001-updated-spec-for-0.12.4.patch
@ -1,26 +0,0 @@
-From fcc1044e270f4580eef1828ab3d09d209999fd60 Mon Sep 17 00:00:00 2001
-From: Will Benton <willb@redhat.com>
-Date: Fri, 9 Dec 2011 15:18:27 -0600
-Subject: [PATCH] updated spec for 0.12.4
-
---
- wallaby.spec.in |    3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
-
-diff --git a/wallaby.spec.in b/wallaby.spec.in
-index c22e8ba..8f861c4 100644
--- a/wallaby.spec.in
-+++ b/wallaby.spec.in
-@@ -274,6 +274,9 @@ fi
- 
- %changelog
- 
-+* Fri Dec 9 2011 willb <willb@redhat> - 0.12.4-1
-+- fixes for minor tool problems that came up in 0.12 development
-+
- * Wed Nov 23 2011 willb <willb@redhat> - 0.12.3-1
- - fix for bz 756402
- 
-- 
-1.7.4.4
-
--- a/2
+++ b/2
@ -1 +1 @@
-185b2513e552960f84c0eebaea0f3e72  wallaby-0.12.4.tar.gz
+4f5df69f3e1e8d69949a609eb5699807  wallaby-0.16.4.tar.gz
--- a/wallaby.spec
+++ b/wallaby.spec
@ -1,5 +1,4 @@
-
-%if 0%{?fedora} >= 15
+%if 0%{?fedora} >= 18
 %global want_systemd 1
 %global wallaby_agent_environment sysconfig/wallaby-agent-env
 %else
@ -13,45 +12,68 @@
 %global building_for_el5 0
 %endif

+%if (0%{?fedora} >= 17 || 0%{?rhel} >= 6)
+%global wallaby_uid -u 181
+%endif
+
 %if (0%{?fedora} != 0)
 %global has_sinatra 1
 %else
 %global has_sinatra 0
 %endif

+%if (0%{?fedora} >= 17)
+%global ruby_abi 1.9.1
+%global ruby_appropriate_install_dir %{ruby_vendorlibdir}
+%global requires_ruby_devel 1
+%else
+%global requires_ruby_devel 0
+%global ruby_abi 1.8
+%{!?ruby_sitelib: %global ruby_sitelib %(ruby -rrbconfig -e 'puts Config::CONFIG["sitelibdir"] ')}
+%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

-%global rubyabi 1.9.1

-Summary: Condor pool configuration service with QMF interface
+
+Summary: HTCondor pool configuration service with QMF interface
 Name: wallaby
-Version: 0.12.4
-Release: 4%{?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.12.4.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
-BuildRequires: ruby-devel
-Requires: ruby(abi) = %{rubyabi}
+
+Requires: %{ruby_runtime}
+
 BuildRequires: ruby
-Requires: ruby-qmf >= 0.7.929717
-Requires: ruby-spqr >= 0.3.5
-Requires: ruby-rhubarb >= 0.2.6
+Requires: ruby-qpid-qmf >= 0.7.929717
+Requires: ruby-spqr >= 0.3.6
+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
@ -61,8 +83,8 @@ Requires(postun): initscripts
 BuildArch: noarch

 %description
-Wallaby is a configuration service for Condor pools.  It provides a
-semantic model of Condor configuration, enabling administrators to
+Wallaby is a configuration service for HTCondor pools.  It provides a
+semantic model of HTCondor configurations, enabling administrators to
 apply high-level features to groups of nodes rather than set the
 values of low-level parameters in configuration files.  Wallaby also
 validates configurations before deploying them, pushes out
@ -72,8 +94,8 @@ and manages multiple versions of configurations.
 %package utils
 Summary: Utilities to interact with the Wallaby service
 Group: Applications/System
-Requires: ruby(abi) = %{rubyabi}
-Requires: ruby-qmf >= 0.7.929717
+Requires: %{ruby_runtime}
+Requires: ruby-qpid-qmf >= 0.7.929717
 Requires: ruby-wallaby = %{version}

 %description utils
@ -83,11 +105,14 @@ 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) = %{rubyabi}
+Requires: %{ruby_runtime}
 Requires: ruby-irb
-Requires: ruby-qmf >= 0.7.929717
+Requires: ruby-qpid-qmf >= 0.7.929717
 Requires: ruby-spqr >= 0.3.5
 Requires: ruby-rhubarb >= 0.2.6
+%if %{requires_ruby_devel}
+BuildRequires: ruby-devel
+%endif
 Provides: ruby(mrg/grid/config) = %{version}

 %package -n python-wallaby
@ -105,9 +130,9 @@ 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) = %{rubyabi}
+Requires: %{ruby_runtime}
 Requires: ruby-irb
-Requires: ruby-qmf >= 0.7.929717
+Requires: ruby-qpid-qmf >= 0.7.929717
 Requires: ruby-wallaby = %{version}-%{release}
 Requires: wallaby-utils = %{version}-%{release}
 Requires: rubygem-sinatra
@ -137,9 +162,9 @@ sed 's/^export //' < etc/sysconfig/wallaby-agent > etc/sysconfig/wallaby-agent-e
 rm -rf %{buildroot}
 %endif
 mkdir -p %{buildroot}/%{_unitdir}
-mkdir -p %{buildroot}/%{ruby_vendorlibdir}/mrg/grid/config/dbmigrate
-mkdir -p %{buildroot}/%{ruby_vendorlibdir}/mrg/grid/config/shell
-mkdir -p %{buildroot}/%{ruby_vendorlibdir}/mrg/grid/util
+mkdir -p %{buildroot}/%{ruby_appropriate_install_dir}/mrg/grid/config/dbmigrate
+mkdir -p %{buildroot}/%{ruby_appropriate_install_dir}/mrg/grid/config/shell
+mkdir -p %{buildroot}/%{ruby_appropriate_install_dir}/mrg/grid/util
 mkdir -p %{buildroot}/%{_bindir}
 mkdir -p %{buildroot}/%{_localstatedir}/lib/wallaby
 mkdir -p %{buildroot}/%{_localstatedir}/lib/wallaby/patches
@ -151,18 +176,18 @@ mkdir -p %{buildroot}/%{_localstatedir}/log/wallaby
 mkdir -p %{buildroot}/%{python_sitelib}/wallaby
 cp -p -f bin/wallaby %{buildroot}/%{_bindir}
 cp -p -f bin/wallaby-agent %{buildroot}/%{_bindir}
-cp -p -f lib/mrg/grid/*.rb %{buildroot}/%{ruby_vendorlibdir}/mrg/grid
-cp -p -f lib/mrg/grid/util/*.rb %{buildroot}/%{ruby_vendorlibdir}/mrg/grid/util
-cp -p -f lib/mrg/grid/config/*.rb %{buildroot}/%{ruby_vendorlibdir}/mrg/grid/config
-cp -p -f lib/mrg/grid/config/shell/*.rb %{buildroot}/%{ruby_vendorlibdir}/mrg/grid/config/shell
+cp -p -f lib/mrg/grid/*.rb %{buildroot}/%{ruby_appropriate_install_dir}/mrg/grid
+cp -p -f lib/mrg/grid/util/*.rb %{buildroot}/%{ruby_appropriate_install_dir}/mrg/grid/util
+cp -p -f lib/mrg/grid/config/*.rb %{buildroot}/%{ruby_appropriate_install_dir}/mrg/grid/config
+cp -p -f lib/mrg/grid/config/shell/*.rb %{buildroot}/%{ruby_appropriate_install_dir}/mrg/grid/config/shell
 # These aren't packaged
-rm -f %{buildroot}/%{ruby_vendorlibdir}/mrg/grid/config/shell/cmd_force_pull.rb
-rm -f %{buildroot}/%{ruby_vendorlibdir}/mrg/grid/config/shell/cmd_force_restart.rb
+rm -f %{buildroot}/%{ruby_appropriate_install_dir}/mrg/grid/config/shell/cmd_force_pull.rb
+rm -f %{buildroot}/%{ruby_appropriate_install_dir}/mrg/grid/config/shell/cmd_force_restart.rb
 # We only want the http server if we have sinatra available
 %if %{has_sinatra} == 0
-rm -f %{buildroot}/%{ruby_vendorlibdir}/mrg/grid/config/shell/cmd_http_server.rb
+rm -f %{buildroot}/%{ruby_appropriate_install_dir}/mrg/grid/config/shell/cmd_http_server.rb
 %endif
-cp -p -f lib/mrg/grid/config/dbmigrate/*.rb %{buildroot}/%{ruby_vendorlibdir}/mrg/grid/config/dbmigrate
+cp -p -f lib/mrg/grid/config/dbmigrate/*.rb %{buildroot}/%{ruby_appropriate_install_dir}/mrg/grid/config/dbmigrate

 %if %{want_systemd} == 0
 cp -p -f etc/wallaby %{buildroot}/%{_initrddir}/wallaby
@ -198,35 +223,24 @@ rm -rf %{buildroot}
 %{_initrddir}/wallaby
 %endif

-%pre
+%pre -n ruby-wallaby
 getent group wallaby >/dev/null || groupadd -r wallaby
 getent group condor >/dev/null || groupadd -r condor
 getent passwd wallaby >/dev/null || \
-  useradd -r -g condor -d %{_localstatedir}/lib/wallaby -s /sbin/nologin \
+  useradd -r %{?wallaby_uid} -g condor -d %{_localstatedir}/lib/wallaby -s /sbin/nologin \
    -c "Owner of Wallaby service" wallaby
 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
@ -266,24 +280,140 @@ fi
 %if %{building_for_el5}
 %defattr(-, root, root, -)
 %endif
-%{ruby_vendorlibdir}/mrg/grid/
+%{ruby_appropriate_install_dir}/mrg/grid/
 %if %{has_sinatra}
-%exclude %{ruby_vendorlibdir}/mrg/grid/config/shell/cmd_http_server.rb
+%exclude %{ruby_appropriate_install_dir}/mrg/grid/config/shell/cmd_http_server.rb

 %files -n wallaby-http-server
-%{ruby_vendorlibdir}/mrg/grid/config/shell/cmd_http_server.rb
+%{ruby_appropriate_install_dir}/mrg/grid/config/shell/cmd_http_server.rb
 %endif

 %changelog
-* Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.12.4-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Thu Feb 13 2014 willb <willb@redhat> - 0.16.4-2
+- uses new-style systemd macros (BZ850363)
+
+* Sat Oct 5 2013 willb <willb@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@redhat> - 0.16.3-1
+- Fixes edge cases reported in BZ 802821
+
+* Fri Jan 4 2013 willb <willb@redhat> - 0.16.2-1
+- Fixes BZs 850205, 885787, 872663, 881366
+- specfile descriptions updated to reflect upstream naming changes
+
+* Fri Oct 12 2012 willb <willb@redhat> - 0.16.1-2
+- Fixes BZs 820419, 825963, 802799, and 801632 (tool support and internal bugs)
+- Fixes BZ 864091 (cosmetic issue:  READ vs READ_ONLY role in list-users)
+- Fixes BZ 864421 (cosmetic issue:  authentication for snapshot commands)
+- Store#storeinit now requires WRITE access
+- This package now uses the designated Wallaby UID on EL6 (available since RHBA-2012:0778-1)
+- Test suite fixes
+
+* Fri Oct 5 2012 willb <willb@redhat> - 0.16.1-1
+- Fixes BZs 786801, 796406, 802821, 850205, 851217, and incorporates all fixes from the 0.16.0 series.
+
+* Fri Oct 5 2012 willb <willb@redhat> - 0.16.0-9
+- Fixes BZ 861055
+
+* Thu Oct 4 2012 willb <willb@redhat> - 0.16.0-8
+- Packaging fixes
+
+* Thu Oct 4 2012 willb <willb@redhat> - 0.16.0-7
+- 0.16.0-6 built without an updated changelog
+
+* Thu Oct 4 2012 willb <willb@redhat> - 0.16.0-6
+- Fixes for database migration errors coming from 0.12.5-10 (but not earlier releases); BZ 861081
+- Fixes for spurious error messages in agent failure cases related to the secret file
+- Fixes for various API methods with incorrect or confusing permissions
+
+* Tue Sep 25 2012 willb <willb@redhat> - 0.16.0-5
+- Addresses more issues uncovered in authentication support (incorporates the "arno" patchset and revisions)
+- Fixes for spurious test-suite failures
+
+* Tue Sep 18 2012 willb <willb@redhat> - 0.16.0-4
+- Addresses issues uncovered while testing authentication support (incorporates the "arno" patchset)
+
+* Thu Sep 6 2012 willb <willb@redhat> - 0.16.0-3
+- Minor fixes to client library crashing bugs exposed by authorization support
+
+* Wed Aug 15 2012 willb <willb@redhat> - 0.16.0-2
+- Added default value for WALLABY_USERDB_NAME to supplied environment file
+- Minor fixes to authorization issues uncovered in development
+
+* Tue Aug 7 2012 willb <willb@redhat> - 0.16.0-1
+- per-method authorization support for wallaby API methods
+- API version bump to 20101031.6
+
+* Thu Jun 28 2012 willb <willb@redhat> - 0.12.5-10
+- fixes BZs 748507, 834141, 807820, and 835525 (all backports from 0.15.x)
+
+* Tue Jun 26 2012 willb <willb@redhat> - 0.15.1-3
+- fixes for some stealthier serialized-configuration type-sniffing bugs and attendant nasty crashes (BZ 835713)
+
+* Thu Jun 21 2012 willb <willb@redhat> - 0.15.1-2
+- fixes to skeleton group support for walk-in nodes
+- more resilient Store#activateConfiguration in the face of event failure/workaround for QMF event problems on F17
+- wallaby-agent no longer deletes potentially-spurious configurations by default
+
+* Wed Jun 20 2012 willb <willb@redhat> - 0.15.1-1
+- fixes bz 834141
+- packaging improvements
+- base-db documenter improvements from upstream (internal only; not packaged)
+
+* Wed Jun 13 2012 willb <willb@redhat> - 0.15.0-1
+- sensible/unified treatment of skeleton group and default group
+
+* Thu May 31 2012 willb <willb@redhat> - 0.14.3-1
+- fixes bz 748507
+
+* Thu May 10 2012 willb <willb@redhat> - 0.14.2-2
+- fixes a trivial crashing bug that sneaked in to the prior package
+
+* Thu May 10 2012 willb <willb@redhat> - 0.14.2-1
+- packaging improvements:  ruby-wallaby now creates the wallaby user, and it does so with a proper UID on F17+ and EL6+
+- base db documentation generator (non-end-user visible)
+- shell support for inspecting node configs (non-end-user visible for now, but used by ruby implementations of ccs/ccp; BZ820419)
+
+* Thu Apr 19 2012 willb <willb@redhat> - 0.14.1-1
+- preliminary tool support for annotations
+- affectedEntities and affectedNodes methods on Store objects
+- API minor version bump; API is now 20101031.5
+
+* Mon Apr 16 2012 willb <willb@redhat> - 0.14.0-1
+- "annotation" property and "setAnnotation" method on snapshots and all configuration entities
+- API minor version bump
+
+* Mon Mar 26 2012 willb <willb@redhat> - 0.13.1-2
+- F17 fixes
+
+* Fri Mar 9 2012 willb <willb@redhat> - 0.13.1-1
+- Fixes BZs 786801 and 796406
+- specfile updates from Fedora work
+
+* Fri Feb 10 2012 willb <willb@redhat> - 0.13.0-2
+- specfile fixes
+
+* Fri Feb 10 2012 willb <willb@redhat> - 0.13.0-1
+- conditional assignment of parameter values ("?=" operator)
+- fix for bz 748507
+- compatibility with Ruby 1.9

 * Fri Feb 10 2012 Vít Ondruch <vondruch@redhat.com> - 0.12.4-3
 - Rebuilt for Ruby 1.9.3.

+* Wed Jan 18 2012 willb <willb@redhat> - 0.12.5-2
+- minor usability fixes to "wallaby inventory -c"
+- fix for bz 782816
+
 * Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.12.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild

+* Tue Jan 10 2012 willb <willb@redhat> - 0.12.5-1
+- the Wallaby shell no longer a priori rejects certain valid SASL authentication mechanisms

 * Fri Dec 9 2011 willb <willb@redhat> - 0.12.4-1
 - fixes for minor tool problems that came up in 0.12 development
Author	SHA1	Message	Date
William Benton	8273e1c57a	BZ850363	2014-02-13 07:36:48 -06:00
William Benton	f2539de667	updated spec	2014-02-13 07:35:34 -06:00
William Benton	7c184c2f4f	0.16.3-3	2013-10-04 09:15:30 -05:00
William Benton	9c26e71e39	0.16.3-2	2013-10-04 09:00:09 -05:00
William Benton	34943aacb3	Updated to wallaby-0.16.3; numerous bugfixes	2013-06-20 21:14:49 -05:00
Will Benton	fd1df13320	updated to wallaby-0.16.0-1	2012-08-14 15:07:04 -05:00