From 76b28012f81b0923486b16c75008c72f758a000e Mon Sep 17 00:00:00 2001
From: Robert Rati <rrati@redhat.com>
Date: Fri, 9 Dec 2011 10:28:02 -0600
Subject: [PATCH 1/2] Build fixes

---
 Rakefile                       |    1 -
 condor-wallaby-base-db.spec.in |   10 ++++++++++
 2 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/Rakefile b/Rakefile
index 2a19731..50e4ce7 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,6 +1,5 @@
 require 'rake'
 require 'erb'
-require 'grit'
 
 PKG_RELEASE=ENV['PKG_RELEASE'] || 1
 
diff --git a/condor-wallaby-base-db.spec.in b/condor-wallaby-base-db.spec.in
index 7500884..9d8c9d8 100644
--- a/condor-wallaby-base-db.spec.in
+++ b/condor-wallaby-base-db.spec.in
@@ -18,6 +18,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 %endif
 Requires: wallaby-utils >= 0.10.7
 BuildRequires: ruby
+%if ! %{building_for_el5}
+BuildRequires: rubygem-rake
+%endif
 BuildArch: noarch
 
 %description
@@ -75,8 +78,15 @@ rm -rf %{buildroot}
 %{_localstatedir}/lib/wallaby/patches/db-1.15.wpatch
 %{_localstatedir}/lib/wallaby/patches/db-1.16.wpatch
 %{_localstatedir}/lib/wallaby/patches/db-1.17.wpatch
+%{_localstatedir}/lib/wallaby/patches/db-1.18.wpatch
 
 %changelog
+* Fri Dec 9 2011 rrati <rrati@redhat> - 1.18-1
+- New params: MASTER.USE_PROCD, RESTART_PROCD_ON_ERROR, COLLECTOR_ARGS,
+              SHARED_PORT_ARGS
+- *_PLUGINS now allow values set on a local machine
+- Added build dep on rake
+
 * Thu Dec 1 2011 rrati <rrati@redhat> - 1.17-1
 - Added SCHEDD.SPOOL and SCHEDD.HISTORY params
 - Updated BaseHAScheduler to use new SCHEDD.* params
-- 
1.7.6.4