From b38cd21978192b327c46048047164da1787a978b Mon Sep 17 00:00:00 2001
From: David Nalley <david@gnsa.us>
Date: Thu, 12 Jan 2012 00:34:06 -0500
Subject: [PATCH] updating to 0.3.0

---
 .gitignore       |  1 +
 sheepdog.service | 10 ++++++++++
 sheepdog.spec    | 50 ++++++++++++++++++++++++++++++++++--------------
 sources          |  2 +-
 4 files changed, 48 insertions(+), 15 deletions(-)
 create mode 100644 sheepdog.service

diff --git a/.gitignore b/.gitignore
index 61af75e..a812f1f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /sheepdog-0.2.3.tar.gz
 /sheepdog-0.2.4.tar.gz
+/collie-sheepdog-v0.3.0-0-gbb41896.tar.gz
diff --git a/sheepdog.service b/sheepdog.service
new file mode 100644
index 0000000..c8fd01e
--- /dev/null
+++ b/sheepdog.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=Sheepdog QEMU/KVM Block Storage
+After=syslog.target
+
+[Service]
+ExecStart=/usr/sbin/sheep
+Type=forking
+
+[Install]
+WantedBy=multi-user.target
diff --git a/sheepdog.spec b/sheepdog.spec
index c0a695e..fcfdba8 100644
--- a/sheepdog.spec
+++ b/sheepdog.spec
@@ -1,20 +1,26 @@
 Name: sheepdog
 Summary: The Sheepdog Distributed Storage System for KVM/QEMU
-Version: 0.2.4
+Version: 0.3.0
 Release: 1%{?dist}
 License: GPLv2 and GPLv2+
 Group: System Environment/Base
 URL: http://www.osrg.net/sheepdog
-Source0: http://downloads.sourceforge.net/project/sheepdog/%{name}/%{version}/%{name}-%{version}.tar.gz
+Source0: collie-sheepdog-v0.3.0-0-gbb41896.tar.gz
+#get source from github here https://github.com/collie/sheepdog/tarball/v0.3.0
+Source1: sheepdog.service
 
 # Runtime bits
 Requires: corosync 
 Requires(post): chkconfig
 Requires(preun): chkconfig
 Requires(preun): initscripts
+Requires(post): systemd-units
+Requires(preun): systemd-units
+Requires(postun): systemd-units
+Requires(post): systemd-sysv
 
 # Build bits
-BuildRequires: autoconf automake
+BuildRequires: autoconf automake systemd-units
 BuildRequires: corosync corosynclib corosynclib-devel
 
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
@@ -31,8 +37,7 @@ This package contains the Sheepdog server, and command line tool which offer
 a distributed object storage system for KVM.
 
 %prep
-%setup -qn collie-sheepdog-bc0ab52
-
+%setup -qn collie-sheepdog-bb41896
 
 %build
 ./autogen.sh
@@ -43,39 +48,56 @@ make %{_smp_mflags}
 rm -rf %{buildroot}
 
 make install DESTDIR=%{buildroot}
-
+mkdir -p %{buildroot}/%{_unitdir}
+cp -a %{SOURCE1} %{buildroot}/%{_unitdir}/
 ## tree fixup
 # drop static libs
 rm -f %{buildroot}%{_libdir}/*.a
-
+rm -f %{buildroot}%{_initddir}/sheepdog
 %clean
 rm -rf %{buildroot}
 
 %post
-/sbin/chkconfig --add sheepdog
+if [ $1 -eq 1 ] ; then 
+    # Initial installation 
+    /bin/systemctl daemon-reload >/dev/null 2>&1 || :
+fi
 
 %preun
 if [ $1 -eq 0 ] ; then
-    /sbin/service sheepdog stop >/dev/null 2>&1
-    /sbin/chkconfig --del sheepdog
+    # Package removal, not upgrade
+    /bin/systemctl --no-reload disable sheepdog.service > /dev/null 2>&1 || :
+    /bin/systemctl stop sheepdog.service > /dev/null 2>&1 || :
 fi
 
 %postun
-if [ "$1" -ge "1" ] ; then
-    /sbin/service sheepdog condrestart >/dev/null 2>&1 || :
+%triggerun -- sheepdog < 0.2.4-2
+/usr/bin/systemd-sysv-convert --save httpd >/dev/null 2>&1 ||:
+/sbin/chkconfig --del httpd >/dev/null 2>&1 || :
+/bin/systemctl try-restart sheepdog.service >/dev/null 2>&1 || :
+/bin/systemctl daemon-reload >/dev/null 2>&1 || :
+if [ $1 -ge 1 ] ; then
+    # Package upgrade, not uninstall
+    /bin/systemctl try-restart sheepdog.service >/dev/null 2>&1 || :
 fi
 
-
 %files
 %defattr(-,root,root,-)
 %doc COPYING README INSTALL
 %{_sbindir}/sheep
 %{_sbindir}/collie
-%attr(755,-,-)%config %{_initddir}/sheepdog
+#%attr(755,-,-)%config %{_initddir}/sheepdog
+%{_unitdir}/sheepdog.service
 %dir %{_localstatedir}/lib/sheepdog
 %{_mandir}/man8/sheep.8*
 
 %changelog
+* Wed Jan 15 2012 David Nalley <david@gnsa.us> - 0.3.0-1
+- updating to 0.3.0
+
+* Thu Nov 24 2011 David Nalley <david@gnsa.us> - 0.2.4-2
+- adding systemd support
+
 * Thu Nov 24 2011 David Nalley <david@gnsa.us> - 0.2.4-1
 - updating to 0.2.4
 
diff --git a/sources b/sources
index 141ba39..e6f62d0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c4443ce1ee7d668f12fa959771131c31  sheepdog-0.2.4.tar.gz
+9b28dad11926ee52cda15a961d9b54fe  collie-sheepdog-v0.3.0-0-gbb41896.tar.gz