diff --git a/.gitignore b/.gitignore index 8b64216..1e8a0cd 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /wallaby-0.12.4.tar.gz /wallaby-0.16.0.tar.gz +/wallaby-0.16.4.tar.gz diff --git a/0001-new-systemd-macros-BZ850363.patch b/0001-new-systemd-macros-BZ850363.patch new file mode 100644 index 0000000..cad1b2b --- /dev/null +++ b/0001-new-systemd-macros-BZ850363.patch @@ -0,0 +1,76 @@ +From 635555319326e48d07d0dca8f9e7bc39c122a1af Mon Sep 17 00:00:00 2001 +From: William Benton +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 - 0.16.4-2 ++- uses new-style systemd macros (BZ850363) ++ + * Sat Oct 5 2013 willb - 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 + diff --git a/0001-updated-spec-for-0.16.0.patch b/0001-updated-spec-for-0.16.0.patch deleted file mode 100644 index dd14ddf..0000000 --- a/0001-updated-spec-for-0.16.0.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 716dba3f7586de04ce2919d93268c1764f9756b6 Mon Sep 17 00:00:00 2001 -From: Will Benton -Date: Tue, 7 Aug 2012 15:13:44 -0500 -Subject: [PATCH] updated spec for 0.16.0 - ---- - wallaby.spec.in | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -diff --git a/wallaby.spec.in b/wallaby.spec.in -index 9d4f4b4..3c58731 100644 ---- a/wallaby.spec.in -+++ b/wallaby.spec.in -@@ -292,6 +292,10 @@ fi - - %changelog - -+* Tue Aug 7 2012 willb - 0.16.0-1 -+- per-method authentication support for wallaby API methods -+- API version bump to 20101031.6 -+ - * Tue Jun 26 2012 willb - 0.15.1-3 - - fixes for some stealthier serialized-configuration type-sniffing bugs and attendant nasty crashes (BZ 835713) - --- -1.7.7.6 - diff --git a/sources b/sources index 21c8e44..4323c78 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4431cdef936097c079361957239d6f53 wallaby-0.16.0.tar.gz +4f5df69f3e1e8d69949a609eb5699807 wallaby-0.16.4.tar.gz diff --git a/wallaby.spec b/wallaby.spec index a2cad12..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 @@ -12,8 +12,7 @@ %global building_for_el5 0 %endif -%if (0%{?fedora} >= 17 && 0%{?rhel} >= 6) -%global +%if (0%{?fedora} >= 17 || 0%{?rhel} >= 6) %global wallaby_uid -u 181 %endif @@ -23,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 @@ -34,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))")} @@ -41,35 +47,33 @@ -Summary: Condor pool configuration service with QMF interface +Summary: HTCondor pool configuration service with QMF interface Name: wallaby -Version: 0.16.0 -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.16.0.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 -%if 0%{?fedora} >= 19 || 0%{?rhel} >= 7 -Requires: ruby(release) -%else -Requires: ruby(abi) = %{?ruby_abi} -%endif + +Requires: %{ruby_runtime} + BuildRequires: ruby -Requires: ruby-qmf >= 0.7.929717 +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 @@ -79,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 @@ -90,12 +94,8 @@ and manages multiple versions of configurations. %package utils Summary: Utilities to interact with the Wallaby service Group: Applications/System -%if 0%{?fedora} >= 19 || 0%{?rhel} >= 7 -Requires: ruby(release) -%else -Requires: ruby(abi) = %{?ruby_abi} -%endif -Requires: ruby-qmf >= 0.7.929717 +Requires: %{ruby_runtime} +Requires: ruby-qpid-qmf >= 0.7.929717 Requires: ruby-wallaby = %{version} %description utils @@ -105,13 +105,9 @@ and node configurations and interacting with the Wallaby service. %package -n ruby-wallaby Summary: Wallaby implementation libraries, API, and client library Group: Applications/System -%if 0%{?fedora} >= 19 || 0%{?rhel} >= 7 -Requires: ruby(release) -%else -Requires: ruby(abi) = %{?ruby_abi} -%endif +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} @@ -134,13 +130,9 @@ that interact with the Wallaby configuration service over QMF. %package -n wallaby-http-server Summary: Wallaby web service interface Group: Applications/System -%if 0%{?fedora} >= 19 || 0%{?rhel} >= 7 -Requires: ruby(release) -%else -Requires: ruby(abi) = %{?ruby_abi} -%endif +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 @@ -241,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 @@ -307,20 +289,68 @@ fi %endif %changelog -* Sun Aug 04 2013 Fedora Release Engineering - 0.16.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild -* Fri Mar 29 2013 Vít Ondruch - 0.16.0-3 -- Rebuild for https://fedoraproject.org/wiki/Features/Ruby_2.0.0 +* Thu Feb 13 2014 willb - 0.16.4-2 +- uses new-style systemd macros (BZ850363) -* Fri Feb 15 2013 Fedora Release Engineering - 0.16.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild +* Sat Oct 5 2013 willb - 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 - 0.16.3-1 +- Fixes edge cases reported in BZ 802821 + +* Fri Jan 4 2013 willb - 0.16.2-1 +- Fixes BZs 850205, 885787, 872663, 881366 +- specfile descriptions updated to reflect upstream naming changes + +* Fri Oct 12 2012 willb - 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 - 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 - 0.16.0-9 +- Fixes BZ 861055 + +* Thu Oct 4 2012 willb - 0.16.0-8 +- Packaging fixes + +* Thu Oct 4 2012 willb - 0.16.0-7 +- 0.16.0-6 built without an updated changelog + +* Thu Oct 4 2012 willb - 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 - 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 - 0.16.0-4 +- Addresses issues uncovered while testing authentication support (incorporates the "arno" patchset) + +* Thu Sep 6 2012 willb - 0.16.0-3 +- Minor fixes to client library crashing bugs exposed by authorization support + +* Wed Aug 15 2012 willb - 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 - 0.16.0-1 -- per-method authentication support for wallaby API methods +- per-method authorization support for wallaby API methods - API version bump to 20101031.6 +* Thu Jun 28 2012 willb - 0.12.5-10 +- fixes BZs 748507, 834141, 807820, and 835525 (all backports from 0.15.x) + * Tue Jun 26 2012 willb - 0.15.1-3 - fixes for some stealthier serialized-configuration type-sniffing bugs and attendant nasty crashes (BZ 835713)