pool/bitlbee
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 587605 from home:lachs0r:branches:server:irc

Browse Source 
- 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
This commit is contained in:
Martin Caj 2018-04-05 09:34:38 +00:00 committed by Git OBS Bridge
parent 498eb1cfc3
commit 003c0bf5d7
3 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
bitlbee.changes
View File

@ -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 Mon Jul 10 10:29:45 UTC 2017 - jengelh@inai.de

1
bitlbee.service-suse.in
View File

@ -20,7 +20,6 @@ ExecStartPre=/usr/bin/chown bitlbee.bitlbee /run/bitlbee
ExecStart=/usr/sbin/bitlbee -F -u bitlbee ExecStart=/usr/sbin/bitlbee -F -u bitlbee
PIDFile=/run/bitlbee/bitlbee.pid PIDFile=/run/bitlbee/bitlbee.pid
ExecReload=/bin/kill -HUP $MAINPID ExecReload=/bin/kill -HUP $MAINPID
KillMode=process
Restart=always Restart=always
[Install] [Install]

12
bitlbee.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package bitlbee # 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> # Copyright (c) 2012 Pascal Bleser <pascal.bleser@opensuse.org>
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
@ -22,9 +22,9 @@ Name: bitlbee
Version: 3.5.1 Version: 3.5.1
Release: 0 Release: 0
Summary: IRC to other Chat Networks Gateway Summary: IRC to other Chat Networks Gateway
License: GPL-2.0 License: GPL-2.0-only
Group: Productivity/Networking/IRC Group: Productivity/Networking/IRC
Url: http://www.bitlbee.org/ URL: http://www.bitlbee.org/
Source: http://get.bitlbee.org/src/bitlbee-%{version}.tar.gz Source: http://get.bitlbee.org/src/bitlbee-%{version}.tar.gz
Source2: %{name}.service-suse.in Source2: %{name}.service-suse.in
BuildRequires: fdupes BuildRequires: fdupes
@ -33,6 +33,9 @@ BuildRequires: gnutls-devel
BuildRequires: libgcrypt-devel BuildRequires: libgcrypt-devel
BuildRequires: lzo-devel BuildRequires: lzo-devel
BuildRequires: pkgconfig BuildRequires: pkgconfig
%if 0%{?suse_version} >= 1500
BuildRequires: python3-base
%endif
BuildRequires: util-linux-systemd BuildRequires: util-linux-systemd
BuildRequires: w3m BuildRequires: w3m
BuildRequires: xmlto BuildRequires: xmlto
@ -85,6 +88,9 @@ find . -name Makefile -exec sed -i.orig 's|@$(CC)|$(CC)|;s|@$(LD)|$(LD)|' {} +
%build %build
# not autoconf - cannot use %%configure # not autoconf - cannot use %%configure
%if 0%{?suse_version} >= 1500
PYTHON=python3 \
%endif
CFLAGS="%{optflags} -fno-strict-aliasing" \ CFLAGS="%{optflags} -fno-strict-aliasing" \
CXXFLAGS="%{optflags} -fno-strict-aliasing" \ CXXFLAGS="%{optflags} -fno-strict-aliasing" \
./configure \ ./configure \