From ca5bfa9febbf6ce9344ede3ea89413b5ce71c39b5eef6b08f9ac9433b67ef0b9 Mon Sep 17 00:00:00 2001 From: Theo Chatzimichos Date: Sat, 18 Jun 2016 13:12:31 +0000 Subject: [PATCH] Accepting request 403364 from home:scarabeus_iv:branches:server:irc - Install devel files to be able to build plugins - Drop sle11 support as we run it on sle12 - Version update to 3.4.2: * irc: Self-messages (messages sent by yourself from other IM clients). IRCv3.1 * support and part of 3.2. Many important groupchat related bugfixes. * jabber: Carbons, see help set carbons. Removed facebook XMPP, use * bitlbee-facebook instead. SASL ANONYMOUS login, see help set anonymous. * hipchat: Channels can now be added with chat add hipchat "channel name" which tries to guess the channel JID. Read more * skype: Show all messages as groupchats since we can't tell which ones are private. This plugin is mostly-deprecated and mostly-broken, use the skypeweb * purple plugin or msn instead. * purple: Fix problems remembering SSL certificates as trusted. Groupchat related fixes. Better error reporting. Fixed setting jabber away states. * And lots of bugfixes / stability improvements. - Cleanup a bit with spec-cleaner and remove sle10 support for readability OBS-URL: https://build.opensuse.org/request/show/403364 OBS-URL: https://build.opensuse.org/package/show/server:irc/bitlbee?expand=0&rev=37 --- bitlbee-3.4.1.tar.gz | 3 - bitlbee-3.4.2.tar.gz | 3 + bitlbee.changes | 32 +++++++ bitlbee.init.d-suse.in | 123 --------------------------- bitlbee.spec | 186 +++++++++++++++++++---------------------- 5 files changed, 123 insertions(+), 224 deletions(-) delete mode 100644 bitlbee-3.4.1.tar.gz create mode 100644 bitlbee-3.4.2.tar.gz delete mode 100644 bitlbee.init.d-suse.in diff --git a/bitlbee-3.4.1.tar.gz b/bitlbee-3.4.1.tar.gz deleted file mode 100644 index 9cad26d..0000000 --- a/bitlbee-3.4.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:500a0b19943040d67458eb3beb0a63d004abb2aa54a777addeb2a895d4f5c0e1 -size 688072 diff --git a/bitlbee-3.4.2.tar.gz b/bitlbee-3.4.2.tar.gz new file mode 100644 index 0000000..fa106b3 --- /dev/null +++ b/bitlbee-3.4.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:69c85554def74f314e3b6e390389a30b0e748f23ef37883e9d7545ee2c45ea57 +size 719456 diff --git a/bitlbee.changes b/bitlbee.changes index dffeb77..a907cd8 100644 --- a/bitlbee.changes +++ b/bitlbee.changes @@ -1,3 +1,35 @@ +------------------------------------------------------------------- +Sat Jun 18 12:48:00 UTC 2016 - tchvatal@suse.com + +- Install devel files to be able to build plugins + +------------------------------------------------------------------- +Sat Jun 18 12:43:33 UTC 2016 - tchvatal@suse.com + +- Drop sle11 support as we run it on sle12 + +------------------------------------------------------------------- +Sat Jun 18 12:37:27 UTC 2016 - tchvatal@suse.com + +- Version update to 3.4.2: + * irc: Self-messages (messages sent by yourself from other IM clients). IRCv3.1 + * support and part of 3.2. Many important groupchat related bugfixes. + * jabber: Carbons, see help set carbons. Removed facebook XMPP, use + * bitlbee-facebook instead. SASL ANONYMOUS login, see help set anonymous. + * hipchat: Channels can now be added with chat add hipchat "channel name" which + tries to guess the channel JID. Read more + * skype: Show all messages as groupchats since we can't tell which ones are + private. This plugin is mostly-deprecated and mostly-broken, use the skypeweb + * purple plugin or msn instead. + * purple: Fix problems remembering SSL certificates as trusted. Groupchat related + fixes. Better error reporting. Fixed setting jabber away states. + * And lots of bugfixes / stability improvements. + +------------------------------------------------------------------- +Sat Jun 18 12:36:01 UTC 2016 - tchvatal@suse.com + +- Cleanup a bit with spec-cleaner and remove sle10 support for readability + ------------------------------------------------------------------- Fri Jun 26 17:33:25 UTC 2015 - lmuelle@suse.com diff --git a/bitlbee.init.d-suse.in b/bitlbee.init.d-suse.in deleted file mode 100644 index 4c0aa55..0000000 --- a/bitlbee.init.d-suse.in +++ /dev/null @@ -1,123 +0,0 @@ -#!/bin/sh -# Copyright (c) 1995-2015 SUSE Linux GmbH, Nuernberg, Germany. -# All rights reserved. -# -# Author: Martin Caj -# -# /etc/init.d/bitlbee -# -# and it's symbolic link -# -# /usr/sbin/rcbitlbee -# -### BEGIN INIT INFO -# Provides: bitlbee -# Required-Start: $remote_fs $syslog -# Should-Start: -# Required-Stop: $remote_fs $syslog -# Should-Stop: -# Default-Start: 2 3 5 -# Default-Stop: 0 1 6 -# Description: Start bitblee IM to IRC gateway -# Short-Description: IM to IRC gateway -### END INIT INFO - -# Check for missing binaries (stale symlinks should not happen) -BITLBEE_BIN="/usr/sbin/bitlbee" -BITLBEE_ETC="/etc/bitlbee" -BITLBEE_PIDDIR="/var/run/bitlbee" -BITLBEE_PID=""$BITLBEE_PIDDIR"/bitlbee.pid" -BITLBEE_PARAM="-p $BITLBEE_PID" - -test -x $BITLBEE_BIN || { echo "$BITLBEE_BIN not installed"; - if [ "$1" = "stop" ]; then exit 0; - else exit 5; fi; } - -# /var/run might be tmfs, so if $BITLBEE_PIDDIR not exist yet create it now. -if [ ! -d "$BITLBEE_PIDDIR" ]; then - /bin/mkdir -p "$BITLBEE_PIDDIR" - /bin/chown bitlbee.bitlbee "$BITLBEE_PIDDIR" -fi - -# Shell functions sourced from /etc/rc.status: -# rc_check check and set local and overall rc status -# rc_status check and set local and overall rc status -# rc_status -v ditto but be verbose in local rc status -# rc_status -v -r ditto and clear the local rc status -# rc_status -s display "skipped" and exit with status 3 -# rc_status -u display "unused" and exit with status 3 -# rc_failed set local and overall rc status to failed -# rc_failed set local and overall rc status to -# rc_reset clear local rc status (overall remains) -# rc_exit exit appropriate to overall rc status -# rc_active checks whether a service is activated by symlinks -# rc_splash arg sets the boot splash screen to arg (if active) -. /etc/rc.status - -# First reset status of this service -rc_reset - -# Return values acc. to LSB for all commands but status: -# 0 - success -# 1 - generic or unspecified error -# 2 - invalid or excess argument(s) -# 3 - unimplemented feature (e.g. "reload") -# 4 - user had insufficient privileges -# 5 - program is not installed -# 6 - program is not configured -# 7 - program is not running -# 8--199 - reserved (8--99 LSB, 100--149 distrib, 150--199 appl) -# -# Note that starting an already running service, stopping -# or restarting a not-running service as well as the restart -# with force-reload (in case signaling is not supported) are -# considered a success. - -case "$1" in - start) - echo -n "Starting bitlbee server" - startproc $BITLBEE_PARAM $BITLBEE_BIN - rc_status -v - ;; - stop) - echo -n "Shutting down bitlbee server" - killproc -TERM $BITLBEE_BIN - rc_status -v - ;; - try-restart) - $0 status >/dev/null && $0 restart - rc_status - ;; - restart) - $0 stop - $0 start - rc_status - ;; -# force-reload) -# echo -n "Reload console mouse support (bitlbee)" -# $0 stop && $0 start -# rc_status -# ;; -# reload) -# echo -n "Reload console mouse support (bitlbee)" -# rc_failed 3 -# rc_status -v -# ;; - status) - echo -n "Checking for bitlbee server: " - checkproc $BITLBEE_BIN - rc_status -v - ;; - probe) - BITLBEE_RESTART="False" - for file in "$BITLBEE_SYSCONFIG" "$BITLBEE_ETC"/* ; do - test "$file" -nt "$BITLBEE_PID" && BITLBEE_RESTART="True" - done - test "$BITLBEE_RESTART" = "True" && echo restart - ;; - *) - echo "Usage: $0 {start|stop|status|try-restart|restart|force-reload|reload|probe}" - exit 1 - ;; -esac -rc_exit diff --git a/bitlbee.spec b/bitlbee.spec index 0b6db33..9213703 100644 --- a/bitlbee.spec +++ b/bitlbee.spec @@ -1,7 +1,7 @@ # # spec file for package bitlbee # -# Copyright (c) 2014-2015 SUSE Linux GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2012 Pascal Bleser # # All modifications and additions to the file contributed by third parties @@ -17,27 +17,9 @@ # -# Define way to log messages for the machine: -%define nnmmsg logger -t %{name}/rpm - -%if 0%{?suse_version} > 1110 -%define with_libotr 1 -%endif - -#define systemd macro on post-12.3 systems only: -%if 0%{?suse_version} >= 1310 - %define with_systemd 1 -%else - %define with_systemd 0 -%endif -# define patch where the service will have pid and socket store: -%if 0%{?suse_version} >= 1310 - %define daemon_piddir /run/%{name} -%else - %define daemon_piddir %{_localstatedir}/run/%{name} -%endif +%define daemon_piddir /run/%{name} Name: bitlbee -Version: 3.4.1 +Version: 3.4.2 Release: 0 Summary: IRC to other Chat Networks Gateway License: GPL-2.0 @@ -46,40 +28,26 @@ 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 -Source3: %{name}.init.d-suse.in -BuildRequires: gcc -BuildRequires: glib2-devel +BuildRequires: fdupes BuildRequires: glibc-devel BuildRequires: gnutls-devel BuildRequires: libgcrypt-devel BuildRequires: lzo-devel -BuildRequires: make BuildRequires: pkgconfig BuildRequires: w3m -BuildRequires: zlib-devel +BuildRequires: xmlto +BuildRequires: pkgconfig(glib-2.0) +BuildRequires: pkgconfig(libotr) >= 4.0.0 +BuildRequires: pkgconfig(purple) +BuildRequires: pkgconfig(systemd) +BuildRequires: pkgconfig(zlib) Requires: logrotate Requires: xinetd -Requires(pre): %{_sbindir}/groupadd -Requires(pre): %{_sbindir}/useradd +Requires(pre): shadow BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if 0%{?suse_version} >= 1010 -BuildRequires: xmlto -%endif -%if 0%{?suse_version} >= 1030 -BuildRequires: fdupes -%endif -%if 0%{?with_libotr:1} -BuildRequires: libotr-devel >= 4.0.0 -%endif -%if 0%{?suse_version} >= 1110 -BuildRequires: libpurple-devel -%endif -%if %{with_systemd} -BuildRequires: systemd %if 0%{?suse_version} > 1310 BuildRequires: util-linux-systemd %endif -%endif %description We are both console lovers. But it is annoying to have a few tty's open with @@ -122,6 +90,28 @@ almost immediately. And the result is BitlBee. This package contains the user guide: %{_docdir}/%{name}/user-guide +%package devel +Summary: IRC to other Chat Networks Gateway (Devel files) +Group: Development/Libraries/C and C++ +Requires: %{name} = %{version} + +%description devel +We are both console lovers. But it is annoying to have a few tty's open with +chat things in them. IRC, ICQ, MSN, Jabber... For X there is Gaim, which +supports many chatprotocols. Why wasn't there such a thing for the console? + +The idea to port Gaim was easily thought of, of course. But we liked our IRC +clients. And we used it the most, so we used it best. Importing it into the +IRC client was a nice idea. But what if someone liked a different client. Then +(s)he had to duplicate our work. + +That's a shame, we thought. Doing work twice is pointless. So when Wilmer got +the ingenious thought in his mind while farming, to create an IRC to other +chatnetworks gateway, we were both so excited, that we started working on it +almost immediately. And the result is BitlBee. + +This package contains development files for external plugins. + %prep %setup -q @@ -133,26 +123,20 @@ find . -name Makefile -exec sed -i.orig 's|@$(CC)|$(CC)|;s|@$(LD)|$(LD)|' {} \; # not autoconf CFLAGS="%{optflags} -fno-strict-aliasing" \ CXXFLAGS="%{optflags} -fno-strict-aliasing" \ +# FIXME: you should use the %%configure macro ./configure \ --prefix="%{_prefix}" \ --bindir="%{_sbindir}" \ --etcdir="%{_sysconfdir}/%{name}" \ --mandir="%{_mandir}" \ + --pcdir="%{_libdir}/pkgconfig" \ --datadir="%{_datadir}/%{name}" \ --plugindir="%{_libdir}/%{name}" \ --pidfile="%{daemon_piddir}/%{name}.pid" \ --config="%{_localstatedir}/lib/%{name}" \ --ipcsocket="%{daemon_piddir}/%{name}.sock" \ -%if 0%{?suse_version} >= 1110 --purple=1 \ -%else - --purple=0 \ -%endif -%if 0%{?with_libotr:1} --otr=1 \ -%else - --otr=0 \ -%endif --msn=1 \ --jabber=1 \ --twitter=1 \ @@ -166,7 +150,7 @@ CXXFLAGS="%{optflags} -fno-strict-aliasing" \ --plugins=1 \ --ssl=gnutls -make %{?_smp_flags} +make %{?_smp_mflags} %install install -d "%{buildroot}%{_mandir}/man1" @@ -174,26 +158,18 @@ install -d "%{buildroot}%{_mandir}/man8" install -d "%{buildroot}%{_sysconfdir}/bitlbee" install -d "%{buildroot}%{_localstatedir}/lib/bitlbee" -%if 0%{?suse_version} >= 1010 make DESTDIR=%{buildroot} -C doc -%endif -%{makeinstall} install-etc +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" -%if 0%{?suse_version} >= 1030 %fdupes -s -%endif -%if %{with_systemd} - install -D -p -m 0644 %{SOURCE2} %{buildroot}%{_unitdir}/%{name}.service - ln -s %{_sbindir}/service %{buildroot}/%{_sbindir}/rc%{name} -%else - install -D -p -m 0755 %{SOURCE3} %{buildroot}%{_initrddir}/%{name} - ln -s %{_initrddir}/%{name} %{buildroot}/%{_sbindir}/rc%{name} -%endif +install -D -p -m 0644 %{SOURCE2} %{buildroot}%{_unitdir}/%{name}.service +ln -s %{_sbindir}/service %{buildroot}/%{_sbindir}/rc%{name} install -d "%{buildroot}%{_docdir}/%{name}" LM="$PWD/%{name}.lang" @@ -212,58 +188,31 @@ cp -a doc/user-guide/*.{txt,html} "%{buildroot}%{_docdir}/%{name}/user-guide/" %pre -# create default user if its need it. -if id bitlbee > /dev/null 2>&1;then - : OK user %{name} already present - %{nnmmsg} "info: The user %{name} for package %{name} is already present" -else - useradd -r -U -s /bin/false -c "bitlbee User" -d %{_localstatedir}/lib/%{name} bitlbee 2> /dev/null || : - %{nnmmsg} "Added user bitlbee for package %{name}" -fi - -%if %{with_systemd} - %service_add_pre %{name}.service -%endif +getent passwd bitlbee >/dev/null || useradd -r -U -d %{_localstatedir}/lib/%{name} -s /sbin/nologin -c "user for %{name}" bitlbee +%service_add_pre %{name}.service %post -%if %{with_systemd} - %service_add_post %{name}.service -%else -%{fillup_and_insserv -n %{name} } -%endif +%service_add_post %{name}.service %preun -%if %{with_systemd} - %service_del_preun %{name}.service -%else - %stop_on_removal %{name} -%endif +%service_del_preun %{name}.service %postun -%if %{with_systemd} - %service_del_postun %{name}.service -%else - %restart_on_update %{name} - %insserv_cleanup -%endif +%service_del_postun %{name}.service %files -f %{name}.lang %defattr(-,root,root) %doc %dir %{_docdir}/%{name} %config(noreplace) %{_sysconfdir}/xinetd.d/bitlbee %attr(0750,root,bitlbee) %dir %{_sysconfdir}/bitlbee -%if %{with_systemd} %{_unitdir}/%{name}.service -%else -%attr(755,root,root) %{_initrddir}/%{name} -%endif %{_sbindir}/rc%{name} %config(noreplace) %attr(0640,root,bitlbee) %{_sysconfdir}/bitlbee/bitlbee.conf %config(noreplace) %attr(0640,root,bitlbee) %{_sysconfdir}/bitlbee/motd.txt %{_sbindir}/bitlbee %{_datadir}/bitlbee -%doc %{_mandir}/man5/bitlbee.conf.5%{ext_man} -%doc %{_mandir}/man8/bitlbee.8%{ext_man} +%{_mandir}/man5/bitlbee.conf.5%{ext_man} +%{_mandir}/man8/bitlbee.8%{ext_man} %attr(0750,bitlbee,bitlbee) %dir %{_localstatedir}/lib/bitlbee %files doc @@ -271,4 +220,45 @@ fi %doc %dir %{_docdir}/%{name} %{_docdir}/%{name}/user-guide +%files devel +%defattr(-,root,root) +%dir %{_includedir}/bitlbee +%{_includedir}/bitlbee/account.h +%{_includedir}/bitlbee/arc.h +%{_includedir}/bitlbee/base64.h +%{_includedir}/bitlbee/bee.h +%{_includedir}/bitlbee/bitlbee.h +%{_includedir}/bitlbee/commands.h +%{_includedir}/bitlbee/conf.h +%{_includedir}/bitlbee/config.h +%{_includedir}/bitlbee/dcc.h +%{_includedir}/bitlbee/events.h +%{_includedir}/bitlbee/ft.h +%{_includedir}/bitlbee/ftutil.h +%{_includedir}/bitlbee/help.h +%{_includedir}/bitlbee/http_client.h +%{_includedir}/bitlbee/ini.h +%{_includedir}/bitlbee/ipc.h +%{_includedir}/bitlbee/irc.h +%{_includedir}/bitlbee/json.h +%{_includedir}/bitlbee/json_util.h +%{_includedir}/bitlbee/log.h +%{_includedir}/bitlbee/md5.h +%{_includedir}/bitlbee/misc.h +%{_includedir}/bitlbee/nick.h +%{_includedir}/bitlbee/nogaim.h +%{_includedir}/bitlbee/oauth.h +%{_includedir}/bitlbee/oauth2.h +%{_includedir}/bitlbee/otr.h +%{_includedir}/bitlbee/proxy.h +%{_includedir}/bitlbee/query.h +%{_includedir}/bitlbee/set.h +%{_includedir}/bitlbee/sha1.h +%{_includedir}/bitlbee/sock.h +%{_includedir}/bitlbee/ssl_client.h +%{_includedir}/bitlbee/storage.h +%{_includedir}/bitlbee/url.h +%{_includedir}/bitlbee/xmltree.h +%{_libdir}/pkgconfig/bitlbee.pc + %changelog