[aeolus-configure/f16] Add patches to ignore delayed_job.

[Chris Lalancette]

commit bfb20f00453f32fb43d065d7c200b35c19c2014b
Author: Chris Lalancette <clalance at redhat.com>
Date:   Mon Aug 1 11:09:08 2011 -0400

    Add patches to ignore delayed_job.
    
    Signed-off-by: Chris Lalancette <clalance at redhat.com>

 0001-Rename-dcuser-to-aeolususer.patch       |   24 ++++++++++++
 0002-Remove-delayed_job-from-configure.patch |   49 ++++++++++++++++++++++++++
 aeolus-configure.spec                        |   32 ++++++++++------
 3 files changed, 93 insertions(+), 12 deletions(-)
---
diff --git a/0001-Rename-dcuser-to-aeolususer.patch b/0001-Rename-dcuser-to-aeolususer.patch
new file mode 100644
index 0000000..15ed248
--- /dev/null
+++ b/0001-Rename-dcuser-to-aeolususer.patch
@@ -0,0 +1,24 @@
+From bc3b8f13540aef711f15d61ee35352e60479b75a Mon Sep 17 00:00:00 2001
+From: Chris Lalancette <clalance at redhat.com>
+Date: Tue, 21 Jun 2011 16:34:51 -0400
+Subject: [PATCH 1/2] Rename dcuser to aeolususer.
+
+Signed-off-by: Chris Lalancette <clalance at redhat.com>
+---
+ recipes/aeolus/manifests/conductor.pp |    2 +-
+ spec/configure_spec.rb                |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/recipes/aeolus/manifests/conductor.pp b/recipes/aeolus/manifests/conductor.pp
+index bdc0064..ad9d358 100644
+--- a/recipes/aeolus/manifests/conductor.pp
++++ b/recipes/aeolus/manifests/conductor.pp
+@@ -116,7 +116,7 @@ class aeolus::conductor::seed_data {
+     aeolus::create_bucket{"aeolus":}
+ 
+     aeolus::site_admin{"$admin_user":
+-       email           => 'dcuser at aeolusproject.org',
++       email           => 'aeolususer at aeolusproject.org',
+        password        => "$admin_password",
+        first_name      => 'aeolus',
+        last_name       => 'user'}
diff --git a/0002-Remove-delayed_job-from-configure.patch b/0002-Remove-delayed_job-from-configure.patch
new file mode 100644
index 0000000..dddbe1e
--- /dev/null
+++ b/0002-Remove-delayed_job-from-configure.patch
@@ -0,0 +1,49 @@
+From 954588baeea8451851d47e901f9070103c4d1220 Mon Sep 17 00:00:00 2001
+From: Chris Lalancette <clalance at redhat.com>
+Date: Fri, 24 Jun 2011 16:36:06 -0400
+Subject: [PATCH 2/2] Remove delayed_job from configure.
+
+Signed-off-by: Chris Lalancette <clalance at redhat.com>
+---
+ recipes/aeolus/manifests/conductor.pp |   12 ++++--------
+ spec/spec_helper.rb                   |    1 -
+ 2 files changed, 4 insertions(+), 9 deletions(-)
+
+diff --git a/recipes/aeolus/manifests/conductor.pp b/recipes/aeolus/manifests/conductor.pp
+index ad9d358..42ea2fc 100644
+--- a/recipes/aeolus/manifests/conductor.pp
++++ b/recipes/aeolus/manifests/conductor.pp
+@@ -31,8 +31,7 @@ class aeolus::conductor inherits aeolus {
+       hasstatus => true,
+       require => File['/etc/condor/config.d/10deltacloud.config'] }
+     service { ['aeolus-conductor',
+-               'conductor-dbomatic',
+-               'conductor-delayed_job']:
++               'conductor-dbomatic' ]:
+       ensure    => 'running',
+       enable    => true,
+       hasstatus => true,
+@@ -164,11 +163,9 @@ class aeolus::conductor::disabled {
+       ensure  => 'stopped',
+       enable  => false,
+       require => Service['aeolus-conductor',
+-                         'conductor-dbomatic',
+-                         'conductor-delayed_job'] }
++                         'conductor-dbomatic'] }
+     service { ['aeolus-conductor',
+-               'conductor-dbomatic',
+-               'conductor-delayed_job']:
++               'conductor-dbomatic']:
+       ensure => 'stopped',
+       enable => false,
+       hasstatus => true }
+@@ -178,8 +175,7 @@ class aeolus::conductor::disabled {
+                 cwd        => "/usr/share/aeolus-conductor",
+                 rails_env  => "production",
+                 require    => Service["aeolus-conductor",
+-                                      "conductor-dbomatic",
+-                                      "conductor-delayed_job"]}
++                                      "conductor-dbomatic"]}
+     postgres::user{"aeolus":
+                     ensure => 'dropped',
+                     require => Rails::Drop::Db["drop_aeolus_database"]}
diff --git a/aeolus-configure.spec b/aeolus-configure.spec
index 9a2bd54..010ac3f 100644
--- a/aeolus-configure.spec
+++ b/aeolus-configure.spec
@@ -1,15 +1,17 @@
-%global dchome /usr/share/aeolus-configure
+%global aeolushome /usr/share/aeolus-configure
 %global pbuild %{_builddir}/%{name}-%{version}
 
 Summary:  Aeolus Configure Puppet Recipe
 Name:     aeolus-configure
 Version:  2.0.1
-Release:  4
+Release:  5%{?dist}
 
 Group:    Applications/Internet
 License:  GPLv2+
 URL:      http://aeolusproject.org
-Source0:  http://repos.fedorapeople.org/repos/aeolus/aeolus-configure/2.0.1/tarball/aeolus-configure-2.0.1.tgz
+Source0:  http://repos.fedorapeople.org/repos/aeolus/%{name}/%{version}/tarball/%{name}-%{version}.tgz
+Patch1: 0001-Rename-dcuser-to-aeolususer.patch
+Patch2: 0002-Remove-delayed_job-from-configure.patch
 BuildArch:  noarch
 Requires:   puppet >= 2.6.6
 Requires:   rubygem(uuidtools)
@@ -24,36 +26,42 @@ Aeolus Configure Puppet Recipe
 
 %prep
 %setup -q
+%patch1 -p1
+%patch2 -p1
 
 %build
 
 %install
-%{__mkdir} -p %{buildroot}/%{dchome}/modules/aeolus %{buildroot}/%{_sbindir}
+%{__mkdir} -p %{buildroot}/%{aeolushome}/modules/aeolus %{buildroot}/%{_sbindir}
 %{__mkdir} -p %{buildroot}%{_sysconfdir}/aeolus-configure/nodes
 %{__cp} -R %{pbuild}/conf/* %{buildroot}%{_sysconfdir}/aeolus-configure/nodes
-%{__cp} -R %{pbuild}/recipes/aeolus/*/ %{buildroot}/%{dchome}/modules/aeolus
-%{__cp} -R %{pbuild}/recipes/apache/ %{buildroot}/%{dchome}/modules/apache
-%{__cp} -R %{pbuild}/recipes/ntp/ %{buildroot}/%{dchome}/modules/ntp
-%{__cp} -R %{pbuild}/recipes/openssl/ %{buildroot}/%{dchome}/modules/openssl
-%{__cp} -R %{pbuild}/recipes/postgres/ %{buildroot}/%{dchome}/modules/postgres
+%{__cp} -R %{pbuild}/recipes/aeolus/*/ %{buildroot}/%{aeolushome}/modules/aeolus
+%{__cp} -R %{pbuild}/recipes/apache/ %{buildroot}/%{aeolushome}/modules/apache
+%{__cp} -R %{pbuild}/recipes/ntp/ %{buildroot}/%{aeolushome}/modules/ntp
+%{__cp} -R %{pbuild}/recipes/openssl/ %{buildroot}/%{aeolushome}/modules/openssl
+%{__cp} -R %{pbuild}/recipes/postgres/ %{buildroot}/%{aeolushome}/modules/postgres
 %{__cp} -R %{pbuild}/bin/aeolus-configure %{buildroot}/%{_sbindir}/
 %{__cp} -R %{pbuild}/bin/aeolus-cleanup %{buildroot}/%{_sbindir}/
 %{__cp} -R %{pbuild}/bin/aeolus-node %{buildroot}/%{_sbindir}/\
 
 # file permissions
-%{__chmod} +x %{buildroot}%{dchome}/modules/aeolus/templates/deltacloud-core
+%{__chmod} +x %{buildroot}%{aeolushome}/modules/aeolus/templates/deltacloud-core
 
 # empty file
-%{__rm} %{buildroot}%{dchome}/modules/ntp/README
+%{__rm} %{buildroot}%{aeolushome}/modules/ntp/README
 
 %files
 %attr(0755, root, root) %{_sbindir}/aeolus-configure
 %attr(0755, root, root) %{_sbindir}/aeolus-cleanup
 %attr(0755, root, root) %{_sbindir}/aeolus-node
 %config(noreplace) %{_sysconfdir}/aeolus-configure/nodes/*
-%{dchome}
+%{aeolushome}
 
 %changelog
+* Mon Aug 01 2011 Chris Lalancette <clalance at redhat.com> - 2.0.1-5
+- Spec file cleanups
+- Add patches to ignore delayed_job
+
 * Mon Jul 25 2011 Mo Morsi <mmorsi at redhat.com> 2.0.1-4
 - updates to conform to fedora guidelines