[aeolus-configure/f16] Update to upstream 2.0.2-gitb7ee8da278

[Chris Lalancette]

commit 0b9ab601d23d205c07737cc340437e5075e11a19
Author: Chris Lalancette <clalance at redhat.com>
Date:   Thu Sep 8 16:36:16 2011 -0400

    Update to upstream 2.0.2-gitb7ee8da278
    
    Signed-off-by: Chris Lalancette <clalance at redhat.com>

 .gitignore                                   |    1 +
 0001-Rename-dcuser-to-aeolususer.patch       |   24 ------------
 0002-Remove-delayed_job-from-configure.patch |   49 --------------------------
 aeolus-configure.spec                        |   40 ++++++++++++--------
 sources                                      |    2 +-
 5 files changed, 26 insertions(+), 90 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 255f966..0d24e27 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /aeolus-configure-2.0.1.tgz
+/aeolus-configure-2.0.2-gitb7ee8da278.tgz
diff --git a/aeolus-configure.spec b/aeolus-configure.spec
index 010ac3f..7b164cd 100644
--- a/aeolus-configure.spec
+++ b/aeolus-configure.spec
@@ -1,17 +1,23 @@
 %global aeolushome /usr/share/aeolus-configure
 %global pbuild %{_builddir}/%{name}-%{version}
 
+%global alphatag gitb7ee8da278
+
 Summary:  Aeolus Configure Puppet Recipe
 Name:     aeolus-configure
-Version:  2.0.1
-Release:  5%{?dist}
+Version:  2.0.2
+Release:  0.1%{alphatag}%{?dist}%{?extra_release}
 
 Group:    Applications/Internet
 License:  GPLv2+
 URL:      http://aeolusproject.org
-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
+# to build source tarball
+# git clone git://git.fedorahosted.org/aeolus/configure.git
+# cd configure
+# git checkout b7ee8da278b271570e314e758b24b84b2d12f576
+# rake package
+# cp pkg/aeolus-configure-2.0.2.tgz ~/rpmbuild/SOURCES
+Source0: %{name}-%{version}-%{alphatag}.tgz
 BuildArch:  noarch
 Requires:   puppet >= 2.6.6
 Requires:   rubygem(uuidtools)
@@ -19,45 +25,47 @@ Requires:   rubygem(uuidtools)
 # create buckets, eventually replace w/ an
 # iwhd client
 Requires:  curl
-Requires:  rubygem-curb
+Requires:  rubygem(curb)
+Requires:  rubygem(highline)
 
 %description
 Aeolus Configure Puppet Recipe
 
 %prep
 %setup -q
-%patch1 -p1
-%patch2 -p1
 
 %build
 
 %install
 %{__mkdir} -p %{buildroot}/%{aeolushome}/modules/aeolus %{buildroot}/%{_sbindir}
+%{__mkdir} -p %{buildroot}/%{_bindir}
 %{__mkdir} -p %{buildroot}%{_sysconfdir}/aeolus-configure/nodes
 %{__cp} -R %{pbuild}/conf/* %{buildroot}%{_sysconfdir}/aeolus-configure/nodes
-%{__cp} -R %{pbuild}/recipes/aeolus/*/ %{buildroot}/%{aeolushome}/modules/aeolus
+%{__mv} %{buildroot}%{_sysconfdir}/aeolus-configure/nodes/custom_template.tdl %{buildroot}%{_sysconfdir}/aeolus-configure/
+%{__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-check-services %{buildroot}/%{_bindir}/
+%{__cp} -R %{pbuild}/bin/aeolus-configure-image %{buildroot}/%{_sbindir}/
 %{__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}%{aeolushome}/modules/aeolus/templates/deltacloud-core
-
-# empty file
-%{__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/*
+%config(noreplace) %{_sysconfdir}/aeolus-configure/*
+%attr(0755, root, root) %{_bindir}/aeolus-check-services
 %{aeolushome}
+%{_sbindir}/aeolus-configure-image
 
 %changelog
+* Thu Sep 08 2011 Chris Lalancette <clalance at redhat.com> - 2.0.2-0.1gitb7ee8da278
+- Update to latest upstream aeolus-configure
+
 * Mon Aug 01 2011 Chris Lalancette <clalance at redhat.com> - 2.0.1-5
 - Spec file cleanups
 - Add patches to ignore delayed_job
diff --git a/sources b/sources
index 1d6ff42..642bc7d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-47bbb632be9dc6b529e00e9c17efa618  aeolus-configure-2.0.1.tgz
+32d61f98af2a646d6005414bb1a42360  aeolus-configure-2.0.2-gitb7ee8da278.tgz