packages: bitlbee/bitlbee.spec, bitlbee/systemd.patch (NEW)=?UTF-8?Q?=20?=- better system...

[glen]

Author: glen                         Date: Sun Apr 15 08:41:52 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- better systemd integration

---- Files affected:
packages/bitlbee:
   bitlbee.spec (1.12 -> 1.13) , systemd.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/bitlbee/bitlbee.spec
diff -u packages/bitlbee/bitlbee.spec:1.12 packages/bitlbee/bitlbee.spec:1.13
--- packages/bitlbee/bitlbee.spec:1.12	Sun Apr 15 10:35:37 2012
+++ packages/bitlbee/bitlbee.spec	Sun Apr 15 10:41:47 2012
@@ -9,13 +9,14 @@
 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}
@@ -29,6 +30,7 @@
 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
@@ -73,6 +75,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 # fix wrong assumption with $DESTDIR
 %{__sed} -i -e 's,$(shell id -u),0,' Makefile
@@ -116,12 +119,17 @@
 %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)
@@ -167,6 +175,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.13  2012/04/15 08:41:47  glen
+- better systemd integration
+
 Revision 1.12  2012/04/15 08:35:37  glen
 - add dedicated bitlbee user
 

================================================================
Index: packages/bitlbee/systemd.patch
diff -u /dev/null packages/bitlbee/systemd.patch:1.1
--- /dev/null	Sun Apr 15 10:41:52 2012
+++ packages/bitlbee/systemd.patch	Sun Apr 15 10:41:47 2012
@@ -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 at bitlbee -D -n
++Restart=always
+ 
+ [Install]
+ WantedBy=multi-user.target
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/bitlbee/bitlbee.spec?r1=1.12&r2=1.13