From a46dad48c176dca4d50b61adfcbec5a0ac4bc309524cd6eefdf786019cb4b5de Mon Sep 17 00:00:00 2001 From: Guido Berhoerster Date: Sat, 16 Aug 2014 13:17:39 +0000 Subject: [PATCH] - update to version 1.0 - plugin "trigger": Swiss Army knife for WeeChat (replaces "rmodifier" plugin) - plugin "exec": execute external commands (replaces script "shell.py") - bare display: easy click on long URLs and text selection with mouse - support of environment variables in /set command - hidden buffers - negated tags in filters - toggle of filters in specific buffers - flexible conditions for adding/removing buffers in hotlist - text search in buffers with free content - support of wildcard "*" inside masks - support of nested variables in evaluated expressions - tag with host in IRC messages displayed - support of "away-notify" IRC capability - IRC commands: /allpv, /remove, /unquiet - bar items: buffer_short_name, irc_nick_modes - unit tests - many bugs fixed - drop obsolete weechat-link-pthread.patch OBS-URL: https://build.opensuse.org/package/show/server:irc/weechat?expand=0&rev=57 --- weechat-0.4.3.tar.bz2 | 3 --- weechat-1.0.tar.bz2 | 3 +++ weechat-capath.patch | 16 ++++++++-------- weechat-link-pthread.patch | 28 ---------------------------- weechat.changes | 26 ++++++++++++++++++++++++++ weechat.spec | 11 +++++------ 6 files changed, 42 insertions(+), 45 deletions(-) delete mode 100644 weechat-0.4.3.tar.bz2 create mode 100644 weechat-1.0.tar.bz2 delete mode 100644 weechat-link-pthread.patch diff --git a/weechat-0.4.3.tar.bz2 b/weechat-0.4.3.tar.bz2 deleted file mode 100644 index 2c66d9e..0000000 --- a/weechat-0.4.3.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a8ec847d331a1201de975530a22f1813c260db420c68675b2ecaa7bf3c7c3ff8 -size 2089701 diff --git a/weechat-1.0.tar.bz2 b/weechat-1.0.tar.bz2 new file mode 100644 index 0000000..de6fdf1 --- /dev/null +++ b/weechat-1.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:82563f222df3a8b3381216d4e97e02bff79b8d836d4dac0eb08ff75bde83cb3d +size 2275868 diff --git a/weechat-capath.patch b/weechat-capath.patch index 239612c..773646b 100644 --- a/weechat-capath.patch +++ b/weechat-capath.patch @@ -9,10 +9,10 @@ Subject: [PATCH] use system's default certificate store src/core/wee-network.c | 6 ++++++ 3 files changed, 12 insertions(+), 4 deletions(-) -Index: weechat-0.4.3/src/core/wee-config.c +Index: weechat-1.0/src/core/wee-config.c =================================================================== ---- weechat-0.4.3.orig/src/core/wee-config.c -+++ weechat-0.4.3/src/core/wee-config.c +--- weechat-1.0.orig/src/core/wee-config.c ++++ weechat-1.0/src/core/wee-config.c @@ -61,7 +61,6 @@ #include "../gui/gui-window.h" #include "../plugins/plugin.h" @@ -21,7 +21,7 @@ Index: weechat-0.4.3/src/core/wee-config.c struct t_config_file *weechat_config_file = NULL; struct t_config_section *weechat_config_section_debug = NULL; struct t_config_section *weechat_config_section_color = NULL; -@@ -3238,7 +3237,7 @@ config_weechat_init_options () +@@ -3306,7 +3305,7 @@ config_weechat_init_options () "gnutls_ca_file", "string", N_("file containing the certificate authorities (\"%h\" will be " "replaced by WeeChat home, \"~/.weechat\" by default)"), @@ -30,11 +30,11 @@ Index: weechat-0.4.3/src/core/wee-config.c &config_change_network_gnutls_ca_file, NULL, NULL, NULL); config_network_gnutls_handshake_timeout = config_file_new_option ( weechat_config_file, ptr_section, -Index: weechat-0.4.3/src/core/wee-network.c +Index: weechat-1.0/src/core/wee-network.c =================================================================== ---- weechat-0.4.3.orig/src/core/wee-network.c -+++ weechat-0.4.3/src/core/wee-network.c -@@ -103,6 +103,12 @@ network_set_gnutls_ca_file () +--- weechat-1.0.orig/src/core/wee-network.c ++++ weechat-1.0/src/core/wee-network.c +@@ -110,6 +110,12 @@ network_set_gnutls_ca_file () } free (ca_path); } diff --git a/weechat-link-pthread.patch b/weechat-link-pthread.patch deleted file mode 100644 index 7682ea7..0000000 --- a/weechat-link-pthread.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 30073b511397646b9ef06ed657fda157dd8c6209 Mon Sep 17 00:00:00 2001 -From: "Jason A. Donenfeld" -Date: Thu, 13 Feb 2014 14:36:23 +0100 -Subject: [PATCH] Link against pthread on all platforms. - -Signed-off-by: Jason A. Donenfeld ---- - src/gui/curses/CMakeLists.txt | 4 +--- - 1 file changed, 1 insertion(+), 3 deletions(-) - -diff --git a/src/gui/curses/CMakeLists.txt b/src/gui/curses/CMakeLists.txt -index 325c611..a8927bc 100644 ---- a/src/gui/curses/CMakeLists.txt -+++ b/src/gui/curses/CMakeLists.txt -@@ -53,9 +53,7 @@ IF(${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD") - ENDIF(HAVE_BACKTRACE) - ENDIF(${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD") - --IF(${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD") -- LIST(APPEND EXTRA_LIBS "pthread") --ENDIF(${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD") -+LIST(APPEND EXTRA_LIBS "pthread") - - IF(ICONV_LIBRARY) - LIST(APPEND EXTRA_LIBS ${ICONV_LIBRARY}) --- -1.8.5.4 - diff --git a/weechat.changes b/weechat.changes index 493ec7e..e0b2056 100644 --- a/weechat.changes +++ b/weechat.changes @@ -1,3 +1,29 @@ +------------------------------------------------------------------- +Sat Aug 16 12:30:39 UTC 2014 - gber@opensuse.org + +- update to version 1.0 + - plugin "trigger": Swiss Army knife for WeeChat (replaces + "rmodifier" plugin) + - plugin "exec": execute external commands (replaces script + "shell.py") + - bare display: easy click on long URLs and text selection with + mouse + - support of environment variables in /set command + - hidden buffers + - negated tags in filters + - toggle of filters in specific buffers + - flexible conditions for adding/removing buffers in hotlist + - text search in buffers with free content + - support of wildcard "*" inside masks + - support of nested variables in evaluated expressions + - tag with host in IRC messages displayed + - support of "away-notify" IRC capability + - IRC commands: /allpv, /remove, /unquiet + - bar items: buffer_short_name, irc_nick_modes + - unit tests + - many bugs fixed +- drop obsolete weechat-link-pthread.patch + ------------------------------------------------------------------- Mon Jun 23 09:24:24 UTC 2014 - tchvatal@suse.com diff --git a/weechat.spec b/weechat.spec index 6829f5b..88f5e31 100644 --- a/weechat.spec +++ b/weechat.spec @@ -17,7 +17,7 @@ Name: weechat -Version: 0.4.3 +Version: 1.0 Release: 0 Summary: Portable, Fast, Light and Extensible Chat Client License: GPL-3.0+ @@ -27,8 +27,6 @@ Source: http://www.weechat.org/files/src/weechat-%{version}.tar.bz2 Source1: weechat.desktop # PATCH-FIX-UPSTREAM weechat-capath.patch https://savannah.nongnu.org/patch/index.php?8153 lnussel@suse.de -- use system's default certificate store Patch0: weechat-capath.patch -# PATCH-FIX-UPSTREAM weechat-link-pthread.patch https://bugs.gentoo.org/show_bug.cgi?id=501078 gber@opensuse.org -- Link Weechat against libpthread -Patch1: weechat-link-pthread.patch BuildRequires: cmake BuildRequires: curl-devel BuildRequires: gcc-c++ @@ -146,7 +144,6 @@ Spell-checking support for %{name}, using the aspell library. %prep %setup -q %patch0 -p1 -%patch1 -p1 modified="$(sed -n '/^----/n;s/ - .*$//;p;q' "%{_sourcedir}/%{name}.changes")" DATE="\"$(date -d "${modified}" "+%%b %%e %%Y")\"" TIME="\"$(date -d "${modified}" "+%%R")\"" @@ -201,7 +198,8 @@ mv "%{buildroot}%{_datadir}/doc/weechat" html %files %defattr(-,root,root) -%doc AUTHORS ChangeLog COPYING NEWS README +%doc AUTHORS.asciidoc ChangeLog.asciidoc Contributing.asciidoc COPYING +%doc README.asciidoc ReleaseNotes.asciidoc %if 0%{?suse_version} > 1220 %doc html/ %endif @@ -211,12 +209,13 @@ mv "%{buildroot}%{_datadir}/doc/weechat" html %dir %{_libdir}/weechat/plugins %{_libdir}/weechat/plugins/alias.so %{_libdir}/weechat/plugins/charset.so +%{_libdir}/weechat/plugins/exec.so %{_libdir}/weechat/plugins/fifo.so %{_libdir}/weechat/plugins/irc.so %{_libdir}/weechat/plugins/logger.so %{_libdir}/weechat/plugins/relay.so -%{_libdir}/weechat/plugins/rmodifier.so %{_libdir}/weechat/plugins/script.so +%{_libdir}/weechat/plugins/trigger.so %{_libdir}/weechat/plugins/xfer.so %if 0%{?suse_version} > 1220 %{_mandir}/man1/weechat.1*