From 810e080b727dc8c6468014ffcc8644a5df07b7fa Mon Sep 17 00:00:00 2001
From: Joe VLcek <jvlcek@redhat.com>
Date: Mon, 25 Jun 2012 13:38:07 -0400
Subject: [PATCH] Update to 0.4.8-1

---
 .gitignore               |  1 +
 aeolus-configserver.spec | 59 +++++++++++++++++++++++++++++++++-------
 sources                  |  2 +-
 3 files changed, 51 insertions(+), 11 deletions(-)

diff --git a/.gitignore b/.gitignore
index 82abbaf..326241a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /aeolus-configserver-0.4.1.tgz
 /aeolus-configserver-0.4.5.tgz
+/aeolus-configserver-0.4.8.tgz
diff --git a/aeolus-configserver.spec b/aeolus-configserver.spec
index e2d28ea..649ae4d 100644
--- a/aeolus-configserver.spec
+++ b/aeolus-configserver.spec
@@ -13,27 +13,37 @@
 #   See the License for the specific language governing permissions and
 #  limitations under the License.
 #
-%define app_root %{_datadir}/%{name}
+%global app_root %{_datadir}/%{name}
 
 Name:       aeolus-configserver
-Version:    0.4.5
+Version:    0.4.8
 Release:    1%{?dist}
 Summary:    The Aeolus Config Server
 
 Group:      Applications/System
 License:    ASL 2.0
 URL:        http://aeolusproject.org
-Source0:    http://joev.fedorapeople.org/configserver/aeolus-configserver-%{version}.tgz
+Source0:    https://github.com/aeolusproject/audrey/tarball/1.0/aeolus-configserver-%{version}.tgz
 
-BuildRequires:   ruby
+BuildRequires:   rubygems
+%if 0%{?fedora} >= 17
+BuildRequires:   ruby(abi) >= 1.9
+%else
+BuildRequires:   ruby(abi) = 1.8
+%endif
 BuildRequires:   ruby-devel
 BuildRequires:   help2man
 
 Requires:        httpd
 Requires:        mod_ssl
 Requires:        puppet
-Requires:        ruby >= 1.8.1
-Requires:        ruby-nokogiri
+Requires:        rubygems
+%if 0%{?fedora} >= 17
+Requires:        ruby(abi) >= 1.9
+%else
+Requires:        ruby(abi) = 1.8
+%endif
+Requires:        rubygem(nokogiri)
 Requires:        rubygem(sinatra)
 Requires:        rubygem(thin)
 Requires:        rubygem(archive-tar-minitar)
@@ -61,6 +71,7 @@ rm -rf %{buildroot}
 # aeolus-configserver
 ##
 mkdir -p %{buildroot}%{app_root}/configure
+mkdir -p %{buildroot}%{app_root}/examples
 mkdir -p %{buildroot}%{_bindir}
 mkdir -p %{buildroot}%{_initrddir}
 mkdir -p %{buildroot}%{_sysconfdir}/sysconfig
@@ -128,6 +139,9 @@ install -m 0644 \
 install configure/bin/config_httpd.sh \
     %{buildroot}%{_bindir}/aeolus-configserver-setup
 
+install examples/katello-register.xml \
+    %{buildroot}%{app_root}/examples
+
 # copy the generated man page from the buildroot
 install -m 0644 aeolus-configserver-setup.8 %{buildroot}%{_mandir}/man8
 
@@ -144,13 +158,15 @@ getent passwd aeolus >/dev/null || \
 
 %post
 # Register the service
-chkconfig --add %{name}
+/sbin/chkconfig --add %{name}
+/sbin/chkconfig %{name} on
+/sbin/chkconfig httpd on
 
 %preun
-# stop and unregister the service before package deletion
+# cleanup the service before package deletion
 if [ $1 = 0 ]; then
-  service %{name} stop > /dev/null 2>&1
-  chkconfig --del %{name}
+  /sbin/service %{name} stop > /dev/null 2>&1
+  /sbin/chkconfig --del %{name}
 fi
 
 %files
@@ -169,6 +185,29 @@ fi
 %doc COPYING
 
 %changelog
+* Thu Apr 12 2012 Greg Blomquist <gblomqui@redhat.com> 0.4.8-1
+- Fixes provided by jlaska@redhat.com for BZ 812107
+- https://bugzilla.redhat.com/show_bug.cgi?id=812107
+- Update the comment in preun to avoid BZ 803864
+- https://bugzilla.redhat.com/show_bug.cgi?id=803864
+* Tue Apr 10 2012 Greg Blomquist <gblomqui@redhat.com> 0.4.7-1
+- Updated deployable XML file for Katello registration
+- https://bugzilla.redhat.com/show_bug.cgi?id=807473
+* Wed Mar 28 2012 Greg Blomquist <gblomqui@redhat.com> 0.4.6-2
+- Added facility to host example deployable XML files
+- Added first example deployable XML file for Katello registration
+- https://bugzilla.redhat.com/show_bug.cgi?id=807473
+* Mon Mar 05 2012 Dan Radez <dradez@redhat.com> 0.4.6-1
+- https://bugzilla.redhat.com/show_bug.cgi?id=798787
+- chkconfig on for http and configserver
+* Thu Feb 09 2012 Greg Blomquist <gblomqui@redhat.com> 0.4.6-0
+- https://bugzilla.redhat.com/show_bug.cgi?id=788996
+* Mon Jan 16 2012 Greg Blomquist <gblomqui@redhat.com> 0.4.5-2
+- https://bugzilla.redhat.com/show_bug.cgi?id=781459
+- https://bugzilla.redhat.com/show_bug.cgi?id=768433
+- https://bugzilla.redhat.com/show_bug.cgi?id=773036
+* Tue Jan 03 2012 Dan Radez <dradez@redhat.com> 0.4.5-1
+- https://bugzilla.redhat.com/show_bug.cgi?id=769656
 * Fri Dec 16 2011 Greg Blomquist <gblomqui@redhat.com> 0.4.4-2
 - https://bugzilla.redhat.com/show_bug.cgi?id=760377
 - https://bugzilla.redhat.com/show_bug.cgi?id=768425
diff --git a/sources b/sources
index 607536f..637ac50 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-74ccb921ab17c2aa6e4a05e95c4bcbb7  aeolus-configserver-0.4.5.tgz
+c0b8868493b269af94c09fe53ca4c295  aeolus-configserver-0.4.8.tgz