From e7b79f98ffe3a8f49b5552c7885898cb05f02993845b49bf7a1f423760a6e93f Mon Sep 17 00:00:00 2001 From: Martin Caj Date: Mon, 10 Nov 2014 11:43:37 +0000 Subject: [PATCH] Accepting request 260546 from home:tampakrap:branches:server:irc - Fix the postun to silence the rpmlint - Whitespace - Add dependency for openSUSE >= 13.2 - Remove user/group from systemd service file. Bitlbee can drop privileges to the user if specified so in its config file. OBS-URL: https://build.opensuse.org/request/show/260546 OBS-URL: https://build.opensuse.org/package/show/server:irc/bitlbee?expand=0&rev=29 --- bitlbee.changes | 13 +++++++++++++ bitlbee.service-suse.in | 4 +--- bitlbee.spec | 5 ++++- 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/bitlbee.changes b/bitlbee.changes index 64cb1ee..d7c1c3e 100644 --- a/bitlbee.changes +++ b/bitlbee.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Sun Nov 9 22:18:46 UTC 2014 - tampakrap@opensuse.org + +- Fix the postun to silence the rpmlint +- Whitespace + +------------------------------------------------------------------- +Wed Nov 5 17:47:50 UTC 2014 - tampakrap@opensuse.org + +- Add dependency for openSUSE >= 13.2 +- Remove user/group from systemd service file. Bitlbee can drop privileges to + the user if specified so in its config file. + ------------------------------------------------------------------- Fri Aug 29 19:42:15 UTC 2014 - mcaj@suse.com diff --git a/bitlbee.service-suse.in b/bitlbee.service-suse.in index fc747e0..8e29e46 100644 --- a/bitlbee.service-suse.in +++ b/bitlbee.service-suse.in @@ -18,12 +18,10 @@ Type=forking ExecStartPre=/usr/bin/mkdir -p /run/bitlbee ExecStartPre=/usr/bin/chown bitlbee.bitlbee /run/bitlbee ExecStart=/usr/sbin/bitlbee -PIDFile=/run/bitlbee/bitlbee.pid +PIDFile=/run/bitlbee/bitlbee.pid ExecReload=/bin/kill -HUP $MAINPID KillMode=process Restart=always -User=bitlbee -Group=bitlbee [Install] WantedBy=multi-user.target diff --git a/bitlbee.spec b/bitlbee.spec index c8e05be..c94e982 100644 --- a/bitlbee.spec +++ b/bitlbee.spec @@ -75,6 +75,9 @@ BuildRequires: libpurple-devel %endif %if %{with_systemd} BuildRequires: systemd +%if 0%{?suse_version} >= 1320 +BuildRequires: util-linux-systemd +%endif %endif %description @@ -233,7 +236,7 @@ fi %postun %if %{with_systemd} - %service_del_postun %{name} + %service_del_postun %{name}.service %else %restart_on_update %{name} %insserv_cleanup