[bitlbee] Add Restart=always to systemd (following upstream #738).

[Matej Cepl]

commit 066ba90e69666a7bb9d3639d31e52adf51950c66
Author: Matěj Cepl <mcepl at redhat.com>
Date:   Thu Jul 28 10:41:02 2011 +0200

    Add Restart=always to systemd (following upstream #738).

 bitlbee-systemd.patch |    3 ++-
 bitlbee.spec          |   11 +++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)
---
diff --git a/bitlbee-systemd.patch b/bitlbee-systemd.patch
index 527317d..a8e5664 100644
--- a/bitlbee-systemd.patch
+++ b/bitlbee-systemd.patch
@@ -2,13 +2,14 @@ Index: bitlbee-3.0.3/init/bitlbee.service.in
 ===================================================================
 --- bitlbee-3.0.3.orig/init/bitlbee.service.in
 +++ bitlbee-3.0.3/init/bitlbee.service.in
-@@ -3,7 +3,8 @@ Description=BitlBee IRC/IM gateway
+@@ -3,7 +3,9 @@ Description=BitlBee IRC/IM gateway
  After=syslog.target
  
  [Service]
 -ExecStart=@sbindir@/bitlbee -F -n
 +Type=simple
 +ExecStart=@sbindir@/bitlbee -D -n
++Restart=always
  
  [Install]
  WantedBy=multi-user.target
diff --git a/bitlbee.spec b/bitlbee.spec
index 19d1f67..1237555 100644
--- a/bitlbee.spec
+++ b/bitlbee.spec
@@ -1,7 +1,7 @@
 Summary:           IRC to other chat networks gateway
 Name:              bitlbee
 Version:           3.0.3
-Release:           2%{?dist}
+Release:           3%{?dist}
 License:           GPLv2+ and MIT
 Group:             System Environment/Daemons
 URL:               http://www.bitlbee.org/
@@ -17,11 +17,11 @@ Patch2:            bitlbee-libresolv.patch
 # Completion of NSS-based SSL implementation. Sent upstream. #714
 # (combined with two tiny fixes from RHBZ #666022)
 Patch4:            bitlbee-des3-implement.patch
-# Reopened http://bugs.bitlbee.org/bitlbee/ticket/738
-Patch5:            bitlbee-systemd.patch
 # When the above patches will  be consolidated upstream, this should merge
 # with Patch1 or Patch2 or something like that
-Patch6:            bitlbee-forkdaemon.patch
+Patch5:            bitlbee-forkdaemon.patch
+# Reopened http://bugs.bitlbee.org/bitlbee/ticket/738
+Patch6:            bitlbee-systemd.patch
 Requires(pre):     shadow-utils
 Requires(preun):   /sbin/service
 BuildRequires:     glib2-devel >= 2.4, libxslt
@@ -193,6 +193,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Thu Jul 28 2011 Matěj Cepl <mcepl at redhat.com> - 3.0.3-3
+- Add Restart=always to systemd (following discussion on upstream #738).
+
 * Mon Jul 25 2011 Matěj Cepl <mcepl at redhat.com> - 3.0.3-2
 - One more fix to the systemd unit files (#705096)