From 04b3116e7cb4eb515ffd40b239930a26d709f086 Mon Sep 17 00:00:00 2001
From: Joe VLcek <jvlcek@redhat.com>
Date: Tue, 18 Sep 2012 10:53:55 -0400
Subject: [PATCH] Update to 0.5.1 with fixes for bzs 850389 856650

---
 .gitignore               |  1 +
 aeolus-configserver.spec | 36 ++++++++++++++++++++++++++++++------
 sources                  |  2 +-
 3 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index 4fa3019..e4e8dce 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /aeolus-configserver-0.4.1.tgz
 /aeolus-configserver-0.4.5.tgz
 /aeolus-configserver-0.5.0.tgz
+/aeolus-configserver-0.5.1.tgz
diff --git a/aeolus-configserver.spec b/aeolus-configserver.spec
index 40b2abf..9688a62 100644
--- a/aeolus-configserver.spec
+++ b/aeolus-configserver.spec
@@ -14,8 +14,8 @@
 #  limitations under the License.
 #
 Name:       aeolus-configserver
-Version:    0.5.0
-Release:    0%{?dist}.20120713134829gitf92ebde
+Version:    0.5.1
+Release:    1%{?dist}
 Summary:    The Aeolus Config Server
 
 Group:      Applications/System
@@ -74,6 +74,11 @@ Requires(post):  chkconfig
 Requires(preun): chkconfig
 Requires(preun): initscripts
 
+%if 0%{?fedora} >= 17
+Requires(post):  systemd-units
+Requires(preun): systemd-units
+%endif
+
 BuildArch:      noarch
 
 %description
@@ -169,6 +174,9 @@ install -m 0644 \
 install configure/bin/config_httpd.sh \
     %{buildroot}%{_bindir}/aeolus-configserver-setup
 
+install conf/aeolus-configserver-thinwrapper \
+    %{buildroot}%{_bindir}/aeolus-configserver-thinwrapper
+
 # copy the generated man page from the buildroot
 install -m 0644 aeolus-configserver-setup.8 %{buildroot}%{_mandir}/man8
 
@@ -190,18 +198,28 @@ getent passwd aeolus >/dev/null || \
   chkconfig %{name} on
   chkconfig httpd on
 %else
-  systemctl enable %{name}.service > /dev/null
+  %if 0%{?fedora} <= 17
+      if [ $1 -eq 1]; then
+          systemctl enable %{name}.service > /dev/null 2>&1 || :
+      fi
+  %else
+      %systemd_post %{name}.service
+  %endif
 %endif
 
 %preun
-# stop and unregister the service before package deletion
+# halt and unregister the service before package deletion
 if [ $1 = 0 ]; then
 %if 0%{?rhel}
   service %{name} stop > /dev/null 2>&1
   chkconfig --del %{name}
 %else
-  systemctl stop %{name}.service > /dev/null
-  systemctl disable %{name}.service > /dev/null
+  %if 0%{?fedora} <= 17
+    /bin/systemctl stop %{name}.service > /dev/null 2>&1 || :
+    /bin/systemctl --no-reload disable %{name}.service > /dev/null 2>&1 || :
+  %else
+    %systemd_preun %{name}.service
+  %endif
 %endif
 fi
 
@@ -237,6 +255,7 @@ fi
 %{app_root}/lib/model/service.rb
 
 %{_bindir}/aeolus-configserver-setup
+%{_bindir}/aeolus-configserver-thinwrapper
 %dir %{_sysconfdir}/%{name}
 
 %if 0%{?rhel}
@@ -254,8 +273,13 @@ fi
 %doc COPYING
 
 %changelog
+* Thu Sep 13 2012 Greg Blomquist <gblomqui@redhat.com> 0.5.0-0
+- https://bugzilla.redhat.com/show_bug.cgi?id=856650
+- https://bugzilla.redhat.com/show_bug.cgi?id=851247
+- https://bugzilla.redhat.com/show_bug.cgi?id=833660
 * Tue Mar 13 2012 Joe VLcek <jvlcek@redhat.com> 0.5.0-0
 - Convert init scripts to sysV and systemd
+- https://bugzilla.redhat.com/show_bug.cgi?id=833660
 * 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
diff --git a/sources b/sources
index 36bb4fe..28d05b5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f0914e1bd8c646e667f12192e2a0dd35  aeolus-configserver-0.5.0.tgz
+b734c3f99a5de9c24f422541694a6518  aeolus-configserver-0.5.1.tgz