[bitlbee] Systemd unit files updated to use Daemon mode instead of ForkDaemon.

[Matej Cepl]

commit d76f62dcd7ed6080a4b96cb840a9a3be05847003
Author: Matěj Cepl <mcepl at redhat.com>
Date:   Mon Jul 25 20:00:30 2011 +0200

    Systemd unit files updated to use Daemon mode instead of ForkDaemon.
    
    Also reopened upstream ticket #738.

 bitlbee-forkdaemon.patch |    7 ++++---
 bitlbee-systemd.patch    |   14 ++++++++++++++
 bitlbee.spec             |   10 ++++++++--
 3 files changed, 26 insertions(+), 5 deletions(-)
---
diff --git a/bitlbee-forkdaemon.patch b/bitlbee-forkdaemon.patch
index ff95f5c..d188a60 100644
--- a/bitlbee-forkdaemon.patch
+++ b/bitlbee-forkdaemon.patch
@@ -1,6 +1,7 @@
-diff -up bitlbee-3.0.1/bitlbee.conf.forkdaemon bitlbee-3.0.1/bitlbee.conf
---- bitlbee-3.0.1/bitlbee.conf.forkdaemon	2010-11-24 23:44:00.000000000 +0100
-+++ bitlbee-3.0.1/bitlbee.conf	2010-12-27 21:17:22.601505634 +0100
+Index: bitlbee-3.0.3/bitlbee.conf
+===================================================================
+--- bitlbee-3.0.3.orig/bitlbee.conf
++++ bitlbee-3.0.3/bitlbee.conf
 @@ -23,14 +23,14 @@
  ## If BitlBee is started by root as a daemon, it can drop root privileges,
  ## and change to the specified user.
diff --git a/bitlbee-systemd.patch b/bitlbee-systemd.patch
new file mode 100644
index 0000000..527317d
--- /dev/null
+++ b/bitlbee-systemd.patch
@@ -0,0 +1,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
+ After=syslog.target
+ 
+ [Service]
+-ExecStart=@sbindir@/bitlbee -F -n
++Type=simple
++ExecStart=@sbindir@/bitlbee -D -n
+ 
+ [Install]
+ WantedBy=multi-user.target
diff --git a/bitlbee.spec b/bitlbee.spec
index 282f433..b098b88 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:           1%{?dist}
+Release:           2%{?dist}
 License:           GPLv2+ and MIT
 Group:             System Environment/Daemons
 URL:               http://www.bitlbee.org/
@@ -17,9 +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
-Patch5:            bitlbee-forkdaemon.patch
+Patch6:            bitlbee-forkdaemon.patch
 Requires(pre):     shadow-utils
 Requires(preun):   /sbin/service
 BuildRequires:     glib2-devel >= 2.4, libxslt
@@ -71,6 +73,7 @@ completely stable and not 100% foolproof so use at your own risk.
 %patch4 -p1
 %if 0%{?fedora} >= 15
 %patch5 -p1
+%patch6 -p1
 %endif
 
 %build
@@ -192,6 +195,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Mon Jul 25 2011 Matěj Cepl <mcepl at redhat.com> - 3.0.3-2
+- One more fix to the systemd unit files (#705096)
+
 * Wed Mar 09 2011 Matěj Cepl <mcepl at redhat.com> - 3.0.2-1
 - New upstream release. We can eliminate parts which were already merged
   upstream (ssl_pending patch)