- better systemd integration

Changed files:
    bitlbee.spec -> 1.13
    systemd.patch -> 1.1

diff --git a/bitlbee.spec b/bitlbee.spec
index 07d60a8515e2aff526618e8fd1081450d7b042aa..7ea05bfd189d35286303b17548d78c1d37fa562b 100644 (file)
--- a/bitlbee.spec
+++ b/bitlbee.spec
@@ -8,13 +8,14 @@ Summary:      An IRC to other chat networks gateway
 Summary(pl.UTF-8):     Bramka pomiędzy IRC-em i innymi sieciami komunikacyjnymi
 Name:          bitlbee
 Version:       3.0.5
-Release:       0.8
+Release:       0.10
 License:       GPL v2+ and MIT
 Group:         Daemons
 Source0:       http://get.bitlbee.org/src/%{name}-%{version}.tar.gz
 # Source0-md5: 9ff97260a2a7f3a7d102db158a8d9887
 URL:           http://www.bitlbee.org/
 Patch0:                config.patch
+Patch1:                systemd.patch
 BuildRequires: asciidoc
 BuildRequires: gnutls-devel
 %{?with_otr:BuildRequires:     libotr-devel >= 3.2.0}
@@ -28,6 +29,7 @@ Requires(pre):        /usr/sbin/groupadd
 Requires(pre): /usr/sbin/useradd
 Provides:      group(bitlbee)
 Provides:      user(bitlbee)
+Requires:      systemd-units >= 37-0.10
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -72,6 +74,7 @@ Skype protocol support for bitlbee.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 # fix wrong assumption with $DESTDIR
 %{__sed} -i -e 's,$(shell id -u),0,' Makefile
@@ -115,12 +118,17 @@ rm -rf $RPM_BUILD_ROOT
 %pre
 %groupadd -g 280 bitlbee
 %useradd -u 280 -d /var/lib/bitlbee -g bitlbee -c "Bitlbee User" bitlbee
+%systemd_post bitlbee.service
+
+%preun
+%systemd_preun bitlbee.service
 
 %postun
 if [ "$1" = "0" ]; then
        %userremove bitlbee
        %groupremove bitlbee
 fi
+%systemd_reload
 
 %files
 %defattr(644,root,root,755)

diff --git a/systemd.patch b/systemd.patch
new file mode 100644 (file)
index 0000000..e3a3918
--- /dev/null
+++ b/systemd.patch
@@ -0,0 +1,15 @@
+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,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