From a566af436c9242f0f82a74a8e7f910f593d7697702da737b0e8cd7ab73021e2c Mon Sep 17 00:00:00 2001 From: Martin Caj Date: Mon, 26 Jun 2017 09:04:13 +0000 Subject: [PATCH] Accepting request 503683 from home:scarabeus_iv:branches:server:irc - Drop the xinetd service from the package * We are switching to socket services, on this service it does not make much sense to actually enable it like that thus simply drom the xinetd binding - Remove always true version check OBS-URL: https://build.opensuse.org/request/show/503683 OBS-URL: https://build.opensuse.org/package/show/server:irc/bitlbee?expand=0&rev=41 --- bitlbee.changes | 9 +++++++++ bitlbee.spec | 14 ++------------ bitlbee.xinetd-suse.in | 14 -------------- 3 files changed, 11 insertions(+), 26 deletions(-) delete mode 100644 bitlbee.xinetd-suse.in diff --git a/bitlbee.changes b/bitlbee.changes index 8d357ab..8f309f1 100644 --- a/bitlbee.changes +++ b/bitlbee.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Wed Jun 14 12:05:51 UTC 2017 - tchvatal@suse.com + +- Drop the xinetd service from the package + * We are switching to socket services, on this service it does + not make much sense to actually enable it like that thus + simply drom the xinetd binding +- Remove always true version check + ------------------------------------------------------------------- Mon Feb 27 08:33:21 UTC 2017 - mcaj@suse.com diff --git a/bitlbee.spec b/bitlbee.spec index 936ae6f..e9518e3 100644 --- a/bitlbee.spec +++ b/bitlbee.spec @@ -1,7 +1,7 @@ # # spec file for package bitlbee # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2012 Pascal Bleser # # All modifications and additions to the file contributed by third parties @@ -26,7 +26,6 @@ License: GPL-2.0 Group: Productivity/Networking/IRC Url: http://www.bitlbee.org/ Source: http://get.bitlbee.org/src/bitlbee-%{version}.tar.gz -Source1: %{name}.xinetd-suse.in Source2: %{name}.service-suse.in BuildRequires: fdupes BuildRequires: glibc-devel @@ -34,6 +33,7 @@ BuildRequires: gnutls-devel BuildRequires: libgcrypt-devel BuildRequires: lzo-devel BuildRequires: pkgconfig +BuildRequires: util-linux-systemd BuildRequires: w3m BuildRequires: xmlto BuildRequires: pkgconfig(glib-2.0) @@ -42,12 +42,7 @@ BuildRequires: pkgconfig(purple) BuildRequires: pkgconfig(systemd) BuildRequires: pkgconfig(zlib) Requires: logrotate -Requires: xinetd Requires(pre): shadow -BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if 0%{?suse_version} > 1310 -BuildRequires: util-linux-systemd -%endif %description We are both console lovers. But it is annoying to have a few tty's open with @@ -162,10 +157,6 @@ make DESTDIR=%{buildroot} -C doc make DESTDIR=%{buildroot} install install-etc make DESTDIR=%{buildroot} install-dev -install -d "%{buildroot}%{_sysconfdir}/xinetd.d" -sed -e "s+@@BITLBEE@@+%{_sbindir}/bitlbee+g" \ - < "%{SOURCE1}" > "%{buildroot}%{_sysconfdir}/xinetd.d/bitlbee" - %fdupes -s install -D -p -m 0644 %{SOURCE2} %{buildroot}%{_unitdir}/%{name}.service @@ -203,7 +194,6 @@ getent passwd bitlbee >/dev/null || useradd -r -U -d %{_localstatedir}/lib/%{nam %files -f %{name}.lang %defattr(-,root,root) %doc %dir %{_docdir}/%{name} -%config(noreplace) %{_sysconfdir}/xinetd.d/bitlbee %attr(0750,root,bitlbee) %dir %{_sysconfdir}/bitlbee %{_unitdir}/%{name}.service %{_sbindir}/rc%{name} diff --git a/bitlbee.xinetd-suse.in b/bitlbee.xinetd-suse.in deleted file mode 100644 index b29f5d3..0000000 --- a/bitlbee.xinetd-suse.in +++ /dev/null @@ -1,14 +0,0 @@ -# default: off -# description: IRC gateway to many IM protocols (MSN, Jabber, ICQ, ...) -service bitlbee -{ - disable = yes - socket_type = stream - protocol = tcp - wait = no - user = bitlbee - group = bitlbee - server = @@BITLBEE@@ - port = 6667 - type = UNLISTED -} \ No newline at end of file