[wallaby/f18] updated to wallaby-0.16.0-1
William Christian Benton
willb at fedoraproject.org
Tue Aug 14 20:08:01 UTC 2012
commit fd1df1332046e634aa3c7ef258840a4cb15663dd
Author: Will Benton <willb at redhat.com>
Date: Tue Aug 14 15:07:04 2012 -0500
updated to wallaby-0.16.0-1
.gitignore | 1 +
0001-updated-spec-for-0.12.4.patch | 26 -------
0001-updated-spec-for-0.16.0.patch | 27 +++++++
sources | 2 +-
wallaby.spec | 137 ++++++++++++++++++++++++++++--------
5 files changed, 135 insertions(+), 58 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4149120..8b64216 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/wallaby-0.12.4.tar.gz
+/wallaby-0.16.0.tar.gz
diff --git a/0001-updated-spec-for-0.16.0.patch b/0001-updated-spec-for-0.16.0.patch
new file mode 100644
index 0000000..dd14ddf
--- /dev/null
+++ b/0001-updated-spec-for-0.16.0.patch
@@ -0,0 +1,27 @@
+From 716dba3f7586de04ce2919d93268c1764f9756b6 Mon Sep 17 00:00:00 2001
+From: Will Benton <willb at redhat.com>
+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 <willb at redhat> - 0.16.0-1
++- per-method authentication support for wallaby API methods
++- API version bump to 20101031.6
++
+ * Tue Jun 26 2012 willb <willb at redhat> - 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 b7e4c28..21c8e44 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-185b2513e552960f84c0eebaea0f3e72 wallaby-0.12.4.tar.gz
+4431cdef936097c079361957239d6f53 wallaby-0.16.0.tar.gz
diff --git a/wallaby.spec b/wallaby.spec
index 1b532e0..5091f35 100644
--- a/wallaby.spec
+++ b/wallaby.spec
@@ -1,4 +1,3 @@
-
%if 0%{?fedora} >= 15
%global want_systemd 1
%global wallaby_agent_environment sysconfig/wallaby-agent-env
@@ -13,38 +12,53 @@
%global building_for_el5 0
%endif
+%if (0%{?fedora} >= 17 && 0%{?rhel} >= 6)
+%global
+%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 %{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
Name: wallaby
-Version: 0.12.4
-Release: 4%{?dist}
+Version: 0.16.0
+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.12.4.patch
+Patch0: 0001-updated-spec-for-0.16.0.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(abi) = %{?ruby_abi}
BuildRequires: ruby
Requires: ruby-qmf >= 0.7.929717
-Requires: ruby-spqr >= 0.3.5
-Requires: ruby-rhubarb >= 0.2.6
+Requires: ruby-spqr >= 0.3.6
+Requires: ruby-rhubarb >= 0.4.3
Requires: ruby-wallaby = %{version}-%{release}
Requires: logrotate >= 0.3
%if %{want_systemd}
@@ -72,7 +86,7 @@ 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(abi) = %{?ruby_abi}
Requires: ruby-qmf >= 0.7.929717
Requires: ruby-wallaby = %{version}
@@ -83,11 +97,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(abi) = %{?ruby_abi}
Requires: ruby-irb
Requires: ruby-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,7 +122,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) = %{rubyabi}
+Requires: ruby(abi) = %{?ruby_abi}
Requires: ruby-irb
Requires: ruby-qmf >= 0.7.929717
Requires: ruby-wallaby = %{version}-%{release}
@@ -137,9 +154,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 +168,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,15 +215,14 @@ 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
@@ -266,24 +282,83 @@ 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 at lists.fedoraproject.org> - 0.12.4-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Tue Aug 7 2012 willb <willb at redhat> - 0.16.0-1
+- per-method authentication support for wallaby API methods
+- API version bump to 20101031.6
+
+* Tue Jun 26 2012 willb <willb at 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 at 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 at 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 at redhat> - 0.15.0-1
+- sensible/unified treatment of skeleton group and default group
+
+* Thu May 31 2012 willb <willb at redhat> - 0.14.3-1
+- fixes bz 748507
+
+* Thu May 10 2012 willb <willb at redhat> - 0.14.2-2
+- fixes a trivial crashing bug that sneaked in to the prior package
+
+* Thu May 10 2012 willb <willb at 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 at 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 at 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 at redhat> - 0.13.1-2
+- F17 fixes
+
+* Fri Mar 9 2012 willb <willb at redhat> - 0.13.1-1
+- Fixes BZs 786801 and 796406
+- specfile updates from Fedora work
+
+* Fri Feb 10 2012 willb <willb at redhat> - 0.13.0-2
+- specfile fixes
+
+* Fri Feb 10 2012 willb <willb at 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 at redhat.com> - 0.12.4-3
- Rebuilt for Ruby 1.9.3.
+* Wed Jan 18 2012 willb <willb at 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 at lists.fedoraproject.org> - 0.12.4-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+* Tue Jan 10 2012 willb <willb at redhat> - 0.12.5-1
+- the Wallaby shell no longer a priori rejects certain valid SASL authentication mechanisms
* Fri Dec 9 2011 willb <willb at redhat> - 0.12.4-1
- fixes for minor tool problems that came up in 0.12 development
More information about the scm-commits
mailing list