From 8e7c843916b00497c6003acfc614b892482f022ae8f5258d94cad26858fa745d Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Mon, 16 May 2022 08:31:51 +0000 Subject: [PATCH] Accepting request 975940 from home:AndreasStieger:branches:server:irc add the Libera chat network to the default configuration to improve the new user experience OBS-URL: https://build.opensuse.org/request/show/975940 OBS-URL: https://build.opensuse.org/package/show/server:irc/irssi?expand=0&rev=124 --- irssi-1.2.3-add-libera.patch | 41 ++++++++++++++++++++++++++++++++++++ irssi.changes | 6 ++++++ irssi.spec | 20 ++++++++++-------- 3 files changed, 58 insertions(+), 9 deletions(-) create mode 100644 irssi-1.2.3-add-libera.patch diff --git a/irssi-1.2.3-add-libera.patch b/irssi-1.2.3-add-libera.patch new file mode 100644 index 0000000..4f1467e --- /dev/null +++ b/irssi-1.2.3-add-libera.patch @@ -0,0 +1,41 @@ +https://github.com/irssi/irssi/commit/1ba48840a112dfacf13cbbf6b77c1e3489fefcf8#diff-5497b19336f6b277da30a72c56ce96e6e5354363a39419cca702448e967d20fc +https://github.com/irssi/irssi/commit/a4486c236a3bf15192d0500b3a1892f7465826c7#diff-5497b19336f6b277da30a72c56ce96e6e5354363a39419cca702448e967d20fc +https://github.com/irssi/irssi/commit/82d2cd88e78b4bffe0c710dd940d1771506eced6#diff-5497b19336f6b277da30a72c56ce96e6e5354363a39419cca702448e967d20fc + +This simply adds the new network. + +Index: irssi-1.2.3/irssi.conf +=================================================================== +--- irssi-1.2.3.orig/irssi.conf ++++ irssi-1.2.3/irssi.conf +@@ -3,6 +3,7 @@ servers = ( + { address = "ssl.efnet.org"; chatnet = "EFNet"; port = "9999"; use_tls = "yes"; }, + { address = "irc.esper.net"; chatnet = "EsperNet"; port = "6697"; use_tls = "yes"; tls_verify = "yes"; }, + { address = "chat.freenode.net"; chatnet = "Freenode"; port = "6697"; use_tls = "yes"; tls_verify = "yes"; }, ++ { address = "irc.libera.chat"; chatnet = "liberachat";port = "6697"; use_tls = "yes"; tls_verify = "yes"; }, + { address = "irc.gamesurge.net"; chatnet = "GameSurge"; port = "6667"; }, + { address = "eu.irc6.net"; chatnet = "IRCnet"; port = "6667"; use_tls = "yes"; }, + { address = "open.ircnet.net"; chatnet = "IRCnet"; port = "6667"; }, +@@ -40,6 +41,12 @@ chatnets = { + max_msgs = "4"; + max_whois = "1"; + }; ++ liberachat = { ++ type = "IRC"; ++ max_kicks = "1"; ++ max_msgs = "4"; ++ max_whois = "1"; ++ }; + GameSurge = { + type = "IRC"; + max_kicks = "1"; +@@ -96,7 +103,8 @@ chatnets = { + channels = ( + { name = "#lobby"; chatnet = "EsperNet"; autojoin = "No"; }, + { name = "#freenode"; chatnet = "Freenode"; autojoin = "No"; }, +- { name = "#irssi"; chatnet = "Freenode"; autojoin = "No"; }, ++ { name = "#libera"; chatnet = "liberachat";autojoin = "No"; }, ++ { name = "#irssi"; chatnet = "liberachat";autojoin = "No"; }, + { name = "#gamesurge"; chatnet = "GameSurge"; autojoin = "No"; }, + { name = "#irssi"; chatnet = "IRCNet"; autojoin = "No"; }, + { name = "#ircsource"; chatnet = "IRCSource"; autojoin = "No"; }, diff --git a/irssi.changes b/irssi.changes index a1d5455..b917e77 100644 --- a/irssi.changes +++ b/irssi.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon May 9 18:41:36 UTC 2022 - Andreas Stieger + +- add the Libera chat network to the default configuration to + improve the new user experience - irssi-1.2.3-add-libera.patch + ------------------------------------------------------------------- Fri Apr 9 14:48:52 UTC 2021 - Ailin Nemui diff --git a/irssi.spec b/irssi.spec index b4808e0..7d91551 100644 --- a/irssi.spec +++ b/irssi.spec @@ -1,7 +1,7 @@ # # spec file for package irssi # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -33,16 +33,10 @@ Source4: %{name}.keyring Source99: irssi-rpmlintrc # PATCH-FIX-OPENSUSE irssi-0.8.16_missing_prototype_warnings.patch Patch1: irssi-0.8.16_missing_prototype_warnings.patch +Patch2: irssi-1.2.3-add-libera.patch BuildRequires: glib2-devel BuildRequires: ncurses-devel BuildRequires: openssl-devel -# the OTR module is optional but the libotr version is too old -%if 0%{?suse_version} > 1330 -BuildRequires: libotr-devel -%endif -%if 0%{?suse_version} > 1330 && 0%{?sle_version} == 0 -BuildRequires: utf8proc-devel -%endif BuildRequires: perl BuildRequires: perl-macros BuildRequires: pkgconfig @@ -50,6 +44,13 @@ BuildRequires: xz Conflicts: %{name}-snapshot %{perl_requires} %{?libperl_requires} +# the OTR module is optional but the libotr version is too old +%if 0%{?suse_version} > 1330 +BuildRequires: libotr-devel +%endif +%if 0%{?suse_version} > 1330 && 0%{?sle_version} == 0 +BuildRequires: utf8proc-devel +%endif %if %{with socks} BuildRequires: dante-devel %endif @@ -79,6 +80,7 @@ compile plugins for the irssi package. %prep %setup -q %patch1 +%patch2 -p1 %build export CFLAGS="%{optflags} -fno-strict-aliasing -DGLIB_DISABLE_DEPRECATION_WARNINGS" @@ -103,7 +105,7 @@ export LDFLAGS="-pie" --with-otr=module \ %endif --with-perl-lib=vendor -make %{?_smp_mflags} all V=1 +%make_build all %install %make_install docdir=%{_docdir}/%{name} V=1