[wallaby/f17] Updated to 0.13.0-2: Ruby 1.9.3 compatibility, improved functionality, packaging fixes.
William Christian Benton
willb at fedoraproject.org
Fri Feb 10 16:43:09 UTC 2012
commit 33474cf1c7a8b9b15380542086087112dfdfb576
Author: Will Benton <willb at redhat.com>
Date: Fri Feb 10 10:43:37 2012 -0600
Updated to 0.13.0-2: Ruby 1.9.3 compatibility, improved functionality, packaging fixes.
.gitignore | 1 +
0001-updated-spec-for-0.12.4.patch | 26 ------
0001-updated-spec-for-0.13.0-2.patch | 152 ++++++++++++++++++++++++++++++++++
sources | 2 +-
wallaby.spec | 74 +++++++++++------
5 files changed, 201 insertions(+), 54 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4149120..8e0fc8a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/wallaby-0.12.4.tar.gz
+/wallaby-0.13.0.tar.gz
diff --git a/0001-updated-spec-for-0.13.0-2.patch b/0001-updated-spec-for-0.13.0-2.patch
new file mode 100644
index 0000000..cd62d49
--- /dev/null
+++ b/0001-updated-spec-for-0.13.0-2.patch
@@ -0,0 +1,152 @@
+From 5e714586307e88f3e0ec7f3516db9a54b5233aac Mon Sep 17 00:00:00 2001
+From: Will Benton <willb at redhat.com>
+Date: Fri, 10 Feb 2012 10:38:19 -0600
+Subject: [PATCH] updated spec for 0.13.0-2
+
+---
+ wallaby.spec.in | 56 +++++++++++++++++++++++++++++++++++-------------------
+ 1 files changed, 36 insertions(+), 20 deletions(-)
+
+diff --git a/wallaby.spec.in b/wallaby.spec.in
+index 9c40b4c..17f9d6f 100644
+--- a/wallaby.spec.in
++++ b/wallaby.spec.in
+@@ -1,5 +1,3 @@
+-%{!?ruby_sitelib: %global ruby_sitelib %(ruby -rrbconfig -e 'puts Config::CONFIG["sitelibdir"] ')}
+-
+ %if 0%{?fedora} >= 15
+ %global want_systemd 1
+ %global wallaby_agent_environment sysconfig/wallaby-agent-env
+@@ -20,6 +18,15 @@
+ %global has_sinatra 0
+ %endif
+
++%if (0%{?fedora} >= 17)
++%global ruby_abi 1.9.1
++%global ruby_appropriate_install_dir %{ruby_vendorlibdir}
++%else
++%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))")}
+@@ -38,7 +45,7 @@ Source0: https://fedorahosted.org/releases/g/r/grid/%{name}-%{version}.tar.gz
+ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+ %endif
+ BuildRequires: python2-devel
+-Requires: ruby(abi) = 1.8
++Requires: ruby(abi) = %{?ruby_abi}
+ BuildRequires: ruby
+ Requires: ruby-qmf >= 0.7.929717
+ Requires: ruby-spqr >= 0.3.6
+@@ -70,7 +77,7 @@ and manages multiple versions of configurations.
+ %package utils
+ Summary: Utilities to interact with the Wallaby service
+ Group: Applications/System
+-Requires: ruby(abi) = 1.8
++Requires: ruby(abi) = %{?ruby_abi}
+ Requires: ruby-qmf >= 0.7.929717
+ Requires: ruby-wallaby = %{version}
+
+@@ -81,7 +88,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) = 1.8
++Requires: ruby(abi) = %{?ruby_abi}
+ Requires: ruby-irb
+ Requires: ruby-qmf >= 0.7.929717
+ Requires: ruby-spqr >= 0.3.5
+@@ -103,7 +110,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) = 1.8
++Requires: ruby(abi) = %{?ruby_abi}
+ Requires: ruby-irb
+ Requires: ruby-qmf >= 0.7.929717
+ Requires: ruby-wallaby = %{version}-%{release}
+@@ -135,9 +142,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_sitelib}/mrg/grid/config/dbmigrate
+-mkdir -p %{buildroot}/%{ruby_sitelib}/mrg/grid/config/shell
+-mkdir -p %{buildroot}/%{ruby_sitelib}/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
+@@ -149,18 +156,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_sitelib}/mrg/grid
+-cp -p -f lib/mrg/grid/util/*.rb %{buildroot}/%{ruby_sitelib}/mrg/grid/util
+-cp -p -f lib/mrg/grid/config/*.rb %{buildroot}/%{ruby_sitelib}/mrg/grid/config
+-cp -p -f lib/mrg/grid/config/shell/*.rb %{buildroot}/%{ruby_sitelib}/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_sitelib}/mrg/grid/config/shell/cmd_force_pull.rb
+-rm -f %{buildroot}/%{ruby_sitelib}/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_sitelib}/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_sitelib}/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
+@@ -264,25 +271,34 @@ fi
+ %if %{building_for_el5}
+ %defattr(-, root, root, -)
+ %endif
+-%{ruby_sitelib}/mrg/grid/
++%{ruby_appropriate_install_dir}/mrg/grid/
+ %if %{has_sinatra}
+-%exclude %{ruby_sitelib}/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_sitelib}/mrg/grid/config/shell/cmd_http_server.rb
++%{ruby_appropriate_install_dir}/mrg/grid/config/shell/cmd_http_server.rb
+ %endif
+
+ %changelog
+
++* 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
+
+--
+1.7.7.5
+
diff --git a/sources b/sources
index b7e4c28..61dc69f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-185b2513e552960f84c0eebaea0f3e72 wallaby-0.12.4.tar.gz
+8058c9647f68f8cc3ab818931b28b524 wallaby-0.13.0.tar.gz
diff --git a/wallaby.spec b/wallaby.spec
index 0e9fa67..094b388 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
@@ -19,32 +18,38 @@
%global has_sinatra 0
%endif
+%if (0%{?fedora} >= 17)
+%global ruby_abi 1.9.1
+%global ruby_appropriate_install_dir %{ruby_vendorlibdir}
+%else
+%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: 3%{?dist}
+Version: 0.13.0
+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-updated-spec-for-0.13.0-2.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 +77,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,7 +88,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) = %{rubyabi}
+Requires: ruby(abi) = %{?ruby_abi}
Requires: ruby-irb
Requires: ruby-qmf >= 0.7.929717
Requires: ruby-spqr >= 0.3.5
@@ -105,7 +110,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 +142,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 +156,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
@@ -266,21 +271,36 @@ 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
+
+* 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