From 003c0bf5d7feef57e5fcc31f79cbad9bb1ac021d80d0bc869918e0c6a1675068 Mon Sep 17 00:00:00 2001
From: Martin Caj <mcaj@suse.com>
Date: Thu, 5 Apr 2018 09:34:38 +0000
Subject: [PATCH] Accepting request 587605 from
 home:lachs0r:branches:server:irc

- Add explicit build time dependency on Python 3.x
  (fixes TW build)
- Use systemd default ("control-group") KillMode for service
  ("process" is not sufficient)

OBS-URL: https://build.opensuse.org/request/show/587605
OBS-URL: https://build.opensuse.org/package/show/server:irc/bitlbee?expand=0&rev=43
---
 bitlbee.changes         | 12 ++++++++++++
 bitlbee.service-suse.in |  1 -
 bitlbee.spec            | 12 +++++++++---
 3 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/bitlbee.changes b/bitlbee.changes
index a038c16..b1ed1f5 100644
--- a/bitlbee.changes
+++ b/bitlbee.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Tue Mar 13 19:13:45 UTC 2018 - 9+suse@cirno.systems
+
+- Add explicit build time dependency on Python 3.x
+  (fixes TW build)
+
+-------------------------------------------------------------------
+Sat Feb 24 15:49:36 UTC 2018 - 9+suse@cirno.systems
+
+- Use systemd default ("control-group") KillMode for service
+  ("process" is not sufficient)
+
 -------------------------------------------------------------------
 Mon Jul 10 10:29:45 UTC 2017 - jengelh@inai.de
 
diff --git a/bitlbee.service-suse.in b/bitlbee.service-suse.in
index cd8d804..3d8fea5 100644
--- a/bitlbee.service-suse.in
+++ b/bitlbee.service-suse.in
@@ -20,7 +20,6 @@ ExecStartPre=/usr/bin/chown bitlbee.bitlbee /run/bitlbee
 ExecStart=/usr/sbin/bitlbee -F -u bitlbee
 PIDFile=/run/bitlbee/bitlbee.pid
 ExecReload=/bin/kill -HUP $MAINPID
-KillMode=process
 Restart=always
 
 [Install]
diff --git a/bitlbee.spec b/bitlbee.spec
index e7d9f9e..3c13912 100644
--- a/bitlbee.spec
+++ b/bitlbee.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package bitlbee
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 # Copyright (c) 2012 Pascal Bleser <pascal.bleser@opensuse.org>
 #
 # All modifications and additions to the file contributed by third parties
@@ -22,9 +22,9 @@ Name:           bitlbee
 Version:        3.5.1
 Release:        0
 Summary:        IRC to other Chat Networks Gateway
-License:        GPL-2.0
+License:        GPL-2.0-only
 Group:          Productivity/Networking/IRC
-Url:            http://www.bitlbee.org/
+URL:            http://www.bitlbee.org/
 Source:         http://get.bitlbee.org/src/bitlbee-%{version}.tar.gz
 Source2:        %{name}.service-suse.in
 BuildRequires:  fdupes
@@ -33,6 +33,9 @@ BuildRequires:  gnutls-devel
 BuildRequires:  libgcrypt-devel
 BuildRequires:  lzo-devel
 BuildRequires:  pkgconfig
+%if 0%{?suse_version} >= 1500
+BuildRequires:  python3-base
+%endif
 BuildRequires:  util-linux-systemd
 BuildRequires:  w3m
 BuildRequires:  xmlto
@@ -85,6 +88,9 @@ find . -name Makefile -exec sed -i.orig 's|@$(CC)|$(CC)|;s|@$(LD)|$(LD)|' {} +
 
 %build
 # not autoconf - cannot use %%configure
+%if 0%{?suse_version} >= 1500
+PYTHON=python3 \
+%endif
 CFLAGS="%{optflags} -fno-strict-aliasing" \
 CXXFLAGS="%{optflags} -fno-strict-aliasing" \
 ./configure \