From 807fd0ea153cbfb8e39b6090f295a17a53668c77dabd6d9aadd541879f42d6c1 Mon Sep 17 00:00:00 2001 From: Guido Berhoerster Date: Mon, 16 May 2011 08:31:45 +0000 Subject: [PATCH 1/3] - update to version 0.3.5: * 256 colors support improved (dynamic allocation of colors) * attributes for colors (bold/reverse/underline) * better scroll of input (with long text) * output of /help improved for list of commands and their arguments * remember scroll position of buffers in windows * list of buffers in filters * count of messages in hotlist buffers * swap buffers of windows * balance of windows * new API function to set help on plugin/script options * speller options in aspell plugin * option for SSL priorities in IRC servers * color nicks in nicklist and output of /names - dropped weechat-0.3.4-fix-array-overflow.patch which has been included upstream OBS-URL: https://build.opensuse.org/package/show/server:irc/weechat?expand=0&rev=34 --- weechat-0.3.4-fix-array-overflow.patch | 11 ----------- weechat-0.3.4.tar.bz2 | 3 --- weechat-0.3.5.tar.bz2 | 3 +++ weechat.changes | 21 +++++++++++++++++++++ weechat.spec | 6 ++---- 5 files changed, 26 insertions(+), 18 deletions(-) delete mode 100644 weechat-0.3.4-fix-array-overflow.patch delete mode 100644 weechat-0.3.4.tar.bz2 create mode 100644 weechat-0.3.5.tar.bz2 diff --git a/weechat-0.3.4-fix-array-overflow.patch b/weechat-0.3.4-fix-array-overflow.patch deleted file mode 100644 index a11886c..0000000 --- a/weechat-0.3.4-fix-array-overflow.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -urNp weechat-0.3.4.orig/src/plugins/scripts/lua/weechat-lua-api.c weechat-0.3.4/src/plugins/scripts/lua/weechat-lua-api.c ---- weechat-0.3.4.orig/src/plugins/scripts/lua/weechat-lua-api.c 2011-02-17 00:00:18.000000000 +0100 -+++ weechat-0.3.4/src/plugins/scripts/lua/weechat-lua-api.c 2011-02-17 00:00:58.000000000 +0100 -@@ -1258,7 +1258,6 @@ weechat_lua_api_config_reload_cb (void * - { - lua_argv[0] = (script_callback->data) ? script_callback->data : empty_arg; - lua_argv[1] = script_ptr2str (config_file); -- lua_argv[2] = NULL; - - rc = (int *) weechat_lua_exec (script_callback->script, - WEECHAT_SCRIPT_EXEC_INT, diff --git a/weechat-0.3.4.tar.bz2 b/weechat-0.3.4.tar.bz2 deleted file mode 100644 index df35ce6..0000000 --- a/weechat-0.3.4.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:391762a8d3a18e236fd6bdceae126af01c55be4605b3e1274f8d59f8def9cbd4 -size 1936679 diff --git a/weechat-0.3.5.tar.bz2 b/weechat-0.3.5.tar.bz2 new file mode 100644 index 0000000..0703ae6 --- /dev/null +++ b/weechat-0.3.5.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c8f86ed75bd57a498702aba7f9c96a99fc1581c6a034bf9a7761d8d578b4e154 +size 2053043 diff --git a/weechat.changes b/weechat.changes index 1829a0d..1b32ae7 100644 --- a/weechat.changes +++ b/weechat.changes @@ -1,3 +1,24 @@ +------------------------------------------------------------------- +Mon May 16 08:24:44 UTC 2011 - gber@opensuse.org + +- update to version 0.3.5: + * 256 colors support improved (dynamic allocation of colors) + * attributes for colors (bold/reverse/underline) + * better scroll of input (with long text) + * output of /help improved for list of commands and their + arguments + * remember scroll position of buffers in windows + * list of buffers in filters + * count of messages in hotlist buffers + * swap buffers of windows + * balance of windows + * new API function to set help on plugin/script options + * speller options in aspell plugin + * option for SSL priorities in IRC servers + * color nicks in nicklist and output of /names +- dropped weechat-0.3.4-fix-array-overflow.patch which has been + included upstream + ------------------------------------------------------------------- Wed Mar 23 23:38:19 UTC 2011 - gber@opensuse.org diff --git a/weechat.spec b/weechat.spec index 13309e6..bcfaf24 100644 --- a/weechat.spec +++ b/weechat.spec @@ -1,5 +1,5 @@ # -# spec file for package weechat (Version 0.3.4) +# spec file for package weechat (Version 0.3.5) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,13 +18,12 @@ # norootforbuild Name: weechat -Version: 0.3.4 +Version: 0.3.5 Release: 0 Summary: Portable, Fast, Light and Extensible Chat Client Source: http://www.weechat.org/files/src/weechat-%{version}.tar.bz2 Source1: weechat.desktop Patch1: weechat-0.3.3-fix-strftime.patch -Patch3: weechat-0.3.4-fix-array-overflow.patch URL: http://www.weechat.org Group: Productivity/Networking/IRC License: GNU General Public License (GPL) @@ -115,7 +114,6 @@ Spell-checking support for %{name}, using the aspell library. %prep %setup -q %patch1 -p1 -%patch3 -p1 modified="$(sed -n '/^----/n;s/ - .*$//;p;q' "%{_sourcedir}/%{name}.changes")" DATE="\"$(date -d "${modified}" "+%%b %%e %%Y")\"" TIME="\"$(date -d "${modified}" "+%%R")\"" From dced99b4a56d608a52fb3b193d4b4680c0a5d7a067abb9b2ed6c4c63f387b3a4 Mon Sep 17 00:00:00 2001 From: Pascal Bleser Date: Sat, 22 Oct 2011 23:05:08 +0000 Subject: [PATCH 2/3] 0.3.6 OBS-URL: https://build.opensuse.org/package/show/server:irc/weechat?expand=0&rev=35 --- weechat-0.3.5.tar.bz2 | 3 - weechat-0.3.6.tar.bz2 | 3 + weechat-remove_build_timestamp.patch | 100 +++++++++++++++++++++++++++ weechat.changes | 10 +++ weechat.spec | 17 +---- 5 files changed, 116 insertions(+), 17 deletions(-) delete mode 100644 weechat-0.3.5.tar.bz2 create mode 100644 weechat-0.3.6.tar.bz2 create mode 100644 weechat-remove_build_timestamp.patch diff --git a/weechat-0.3.5.tar.bz2 b/weechat-0.3.5.tar.bz2 deleted file mode 100644 index 0703ae6..0000000 --- a/weechat-0.3.5.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c8f86ed75bd57a498702aba7f9c96a99fc1581c6a034bf9a7761d8d578b4e154 -size 2053043 diff --git a/weechat-0.3.6.tar.bz2 b/weechat-0.3.6.tar.bz2 new file mode 100644 index 0000000..2cd7642 --- /dev/null +++ b/weechat-0.3.6.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6c367e36fb76de318410f0bc5f2043056155ffe1372c121c1f90520b4645a27e +size 2179857 diff --git a/weechat-remove_build_timestamp.patch b/weechat-remove_build_timestamp.patch new file mode 100644 index 0000000..20dfac3 --- /dev/null +++ b/weechat-remove_build_timestamp.patch @@ -0,0 +1,100 @@ +--- src/core/wee-command.c.orig 2011-10-23 00:34:57.320000419 +0200 ++++ src/core/wee-command.c 2011-10-23 01:03:31.698000421 +0200 +@@ -4642,11 +4642,8 @@ + if (translated_string) + { + snprintf (string, sizeof (string), +- "WeeChat %s [%s %s %s]", +- PACKAGE_VERSION, +- _("compiled on"), +- __DATE__, +- __TIME__); ++ "WeeChat %s", ++ PACKAGE_VERSION); + input_data (buffer, string); + if (weechat_upgrade_count > 0) + { +@@ -4662,11 +4659,7 @@ + else + { + snprintf (string, sizeof (string), +- "WeeChat %s [%s %s %s]", +- PACKAGE_VERSION, +- "compiled on", +- __DATE__, +- __TIME__); ++ "WeeChat %s", PACKAGE_VERSION); + input_data (buffer, string); + if (weechat_upgrade_count > 0) + { +@@ -4682,15 +4675,9 @@ + } + else + { +- gui_chat_printf (NULL, "%sWeeChat %s %s[%s%s %s %s%s]", ++ gui_chat_printf (NULL, "%sWeeChat %s", + GUI_COLOR(GUI_COLOR_CHAT_BUFFER), +- PACKAGE_VERSION, +- GUI_COLOR(GUI_COLOR_CHAT_DELIMITERS), +- GUI_COLOR(GUI_COLOR_CHAT_VALUE), +- _("compiled on"), +- __DATE__, +- __TIME__, +- GUI_COLOR(GUI_COLOR_CHAT_DELIMITERS)); ++ PACKAGE_VERSION); + if (weechat_upgrade_count > 0) + { + gui_chat_printf (NULL, +--- src/core/weechat.c.orig 2011-10-23 00:59:56.544000420 +0200 ++++ src/core/weechat.c 2011-10-23 01:00:35.874000421 +0200 +@@ -114,11 +114,11 @@ + string_iconv_fprintf (stdout, "\n"); + string_iconv_fprintf (stdout, + /* TRANSLATORS: "%s %s" after "compiled on" is date and time */ +- _("WeeChat %s Copyright %s, compiled on %s %s\n" ++ _("WeeChat %s Copyright %s\n" + "Developed by Sebastien Helleu " + "- %s"), + PACKAGE_VERSION, WEECHAT_COPYRIGHT_DATE, +- __DATE__, __TIME__, WEECHAT_WEBSITE); ++ WEECHAT_WEBSITE); + string_iconv_fprintf (stdout, "\n"); + } + +--- src/core/wee-log.c.orig 2011-10-23 01:00:41.917000421 +0200 ++++ src/core/wee-log.c 2011-10-23 01:00:57.506000420 +0200 +@@ -115,8 +115,8 @@ + "with another home using \"--dir\" command line option.\n")); + exit (1); + } +- log_printf ("%s (%s %s %s)", +- PACKAGE_STRING, _("compiled on"), __DATE__, __TIME__); ++ log_printf ("%s", ++ PACKAGE_STRING); + } + + /* +--- src/core/wee-backtrace.c.orig 2011-10-23 00:59:39.654000420 +0200 ++++ src/core/wee-backtrace.c 2011-10-23 00:59:50.818000421 +0200 +@@ -160,8 +160,8 @@ + #endif + + weechat_backtrace_printf ("======= WeeChat backtrace ======="); +- weechat_backtrace_printf ("(written by %s, compiled on %s %s)", +- PACKAGE_STRING, __DATE__, __TIME__); ++ weechat_backtrace_printf ("(written by %s)", ++ PACKAGE_STRING); + + #ifdef HAVE_BACKTRACE + trace_size = backtrace (trace, BACKTRACE_MAX); +--- src/plugins/plugin-api.c.orig 2011-10-23 01:01:02.617000421 +0200 ++++ src/plugins/plugin-api.c 2011-10-23 01:01:20.814000421 +0200 +@@ -304,7 +304,7 @@ + } + else if (string_strcasecmp (info_name, "date") == 0) + { +- return __DATE__; ++ return ""; + } + else if (string_strcasecmp (info_name, "dir_separator") == 0) + { diff --git a/weechat.changes b/weechat.changes index 1b32ae7..b997c6e 100644 --- a/weechat.changes +++ b/weechat.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Sat Oct 22 22:33:19 UTC 2011 - pascal.bleser@opensuse.org + +- update to 0.3.6: + * bold is not used any more for basic colors (used only if terminal has less + than 16 colors), a new option has been added to force bold if needed: + 'weechat.look.color_basic_force_bold' + * option 'weechat.look.hline_char' has been renamed to + 'weechat.look.separator_horizontal' + ------------------------------------------------------------------- Mon May 16 08:24:44 UTC 2011 - gber@opensuse.org diff --git a/weechat.spec b/weechat.spec index bcfaf24..4b3386c 100644 --- a/weechat.spec +++ b/weechat.spec @@ -18,12 +18,13 @@ # norootforbuild Name: weechat -Version: 0.3.5 +Version: 0.3.6 Release: 0 Summary: Portable, Fast, Light and Extensible Chat Client Source: http://www.weechat.org/files/src/weechat-%{version}.tar.bz2 Source1: weechat.desktop Patch1: weechat-0.3.3-fix-strftime.patch +Patch2: weechat-remove_build_timestamp.patch URL: http://www.weechat.org Group: Productivity/Networking/IRC License: GNU General Public License (GPL) @@ -46,13 +47,6 @@ chat environment. It can be entirely controlled with the keyboard, has a plugin-based architecture and is customizable and extensible with scripts in several scripting languages. - - - -Authors: --------- - Sebastien Helleu - %lang_package %package devel @@ -114,12 +108,7 @@ Spell-checking support for %{name}, using the aspell library. %prep %setup -q %patch1 -p1 -modified="$(sed -n '/^----/n;s/ - .*$//;p;q' "%{_sourcedir}/%{name}.changes")" -DATE="\"$(date -d "${modified}" "+%%b %%e %%Y")\"" -TIME="\"$(date -d "${modified}" "+%%R")\"" -find . -name '*.[ch]' |\ - xargs sed -i "s/__DATE__/${DATE}/g;s/__TIME__/${TIME}/g" - +%patch2 %build export CFLAGS="%{optflags}" From b0352f598b3adf864a44eb65624c14e6a13c0230f1621acaf5c5ff58544301c6 Mon Sep 17 00:00:00 2001 From: Guido Berhoerster Date: Sun, 23 Oct 2011 08:32:56 +0000 Subject: [PATCH 3/3] - removed weechat-remove_build_timestamp.patch and use previous code again to deal with timestamps - fixed up previous changelog entry OBS-URL: https://build.opensuse.org/package/show/server:irc/weechat?expand=0&rev=36 --- weechat-remove_build_timestamp.patch | 100 --------------------------- weechat.changes | 29 ++++++-- weechat.spec | 7 +- 3 files changed, 29 insertions(+), 107 deletions(-) delete mode 100644 weechat-remove_build_timestamp.patch diff --git a/weechat-remove_build_timestamp.patch b/weechat-remove_build_timestamp.patch deleted file mode 100644 index 20dfac3..0000000 --- a/weechat-remove_build_timestamp.patch +++ /dev/null @@ -1,100 +0,0 @@ ---- src/core/wee-command.c.orig 2011-10-23 00:34:57.320000419 +0200 -+++ src/core/wee-command.c 2011-10-23 01:03:31.698000421 +0200 -@@ -4642,11 +4642,8 @@ - if (translated_string) - { - snprintf (string, sizeof (string), -- "WeeChat %s [%s %s %s]", -- PACKAGE_VERSION, -- _("compiled on"), -- __DATE__, -- __TIME__); -+ "WeeChat %s", -+ PACKAGE_VERSION); - input_data (buffer, string); - if (weechat_upgrade_count > 0) - { -@@ -4662,11 +4659,7 @@ - else - { - snprintf (string, sizeof (string), -- "WeeChat %s [%s %s %s]", -- PACKAGE_VERSION, -- "compiled on", -- __DATE__, -- __TIME__); -+ "WeeChat %s", PACKAGE_VERSION); - input_data (buffer, string); - if (weechat_upgrade_count > 0) - { -@@ -4682,15 +4675,9 @@ - } - else - { -- gui_chat_printf (NULL, "%sWeeChat %s %s[%s%s %s %s%s]", -+ gui_chat_printf (NULL, "%sWeeChat %s", - GUI_COLOR(GUI_COLOR_CHAT_BUFFER), -- PACKAGE_VERSION, -- GUI_COLOR(GUI_COLOR_CHAT_DELIMITERS), -- GUI_COLOR(GUI_COLOR_CHAT_VALUE), -- _("compiled on"), -- __DATE__, -- __TIME__, -- GUI_COLOR(GUI_COLOR_CHAT_DELIMITERS)); -+ PACKAGE_VERSION); - if (weechat_upgrade_count > 0) - { - gui_chat_printf (NULL, ---- src/core/weechat.c.orig 2011-10-23 00:59:56.544000420 +0200 -+++ src/core/weechat.c 2011-10-23 01:00:35.874000421 +0200 -@@ -114,11 +114,11 @@ - string_iconv_fprintf (stdout, "\n"); - string_iconv_fprintf (stdout, - /* TRANSLATORS: "%s %s" after "compiled on" is date and time */ -- _("WeeChat %s Copyright %s, compiled on %s %s\n" -+ _("WeeChat %s Copyright %s\n" - "Developed by Sebastien Helleu " - "- %s"), - PACKAGE_VERSION, WEECHAT_COPYRIGHT_DATE, -- __DATE__, __TIME__, WEECHAT_WEBSITE); -+ WEECHAT_WEBSITE); - string_iconv_fprintf (stdout, "\n"); - } - ---- src/core/wee-log.c.orig 2011-10-23 01:00:41.917000421 +0200 -+++ src/core/wee-log.c 2011-10-23 01:00:57.506000420 +0200 -@@ -115,8 +115,8 @@ - "with another home using \"--dir\" command line option.\n")); - exit (1); - } -- log_printf ("%s (%s %s %s)", -- PACKAGE_STRING, _("compiled on"), __DATE__, __TIME__); -+ log_printf ("%s", -+ PACKAGE_STRING); - } - - /* ---- src/core/wee-backtrace.c.orig 2011-10-23 00:59:39.654000420 +0200 -+++ src/core/wee-backtrace.c 2011-10-23 00:59:50.818000421 +0200 -@@ -160,8 +160,8 @@ - #endif - - weechat_backtrace_printf ("======= WeeChat backtrace ======="); -- weechat_backtrace_printf ("(written by %s, compiled on %s %s)", -- PACKAGE_STRING, __DATE__, __TIME__); -+ weechat_backtrace_printf ("(written by %s)", -+ PACKAGE_STRING); - - #ifdef HAVE_BACKTRACE - trace_size = backtrace (trace, BACKTRACE_MAX); ---- src/plugins/plugin-api.c.orig 2011-10-23 01:01:02.617000421 +0200 -+++ src/plugins/plugin-api.c 2011-10-23 01:01:20.814000421 +0200 -@@ -304,7 +304,7 @@ - } - else if (string_strcasecmp (info_name, "date") == 0) - { -- return __DATE__; -+ return ""; - } - else if (string_strcasecmp (info_name, "dir_separator") == 0) - { diff --git a/weechat.changes b/weechat.changes index b997c6e..69b0e4c 100644 --- a/weechat.changes +++ b/weechat.changes @@ -1,12 +1,31 @@ +------------------------------------------------------------------- +Sun Oct 23 08:07:47 UTC 2011 - gber@opensuse.org + +- removed weechat-remove_build_timestamp.patch and use previous + code again to deal with timestamps + ------------------------------------------------------------------- Sat Oct 22 22:33:19 UTC 2011 - pascal.bleser@opensuse.org - update to 0.3.6: - * bold is not used any more for basic colors (used only if terminal has less - than 16 colors), a new option has been added to force bold if needed: - 'weechat.look.color_basic_force_bold' - * option 'weechat.look.hline_char' has been renamed to - 'weechat.look.separator_horizontal' + * mouse support + * cursor mode (free movement of cursor on screen) + * contexts for keys (default, search, cursor, mouse) + * hdata in API (direct access to WeeChat data) + * "inactive" colors for inactive windows and lines in merged + buffers + * support of merged buffers in /layout, save layout of + buffers/windows on /upgrade + * horizontal scrolling in buffers with free content + * split of outgoing IRC messages + * options for "more" chars in bars + * bold not used any more for basic colors (if terminal has more + than 16 colors) + * automatic zoom on current window when terminal becomes too + small for windows + * new command /repeat + * local variable "highlight_regex" in buffers +- added weechat-remove_build_timestamp.patch ------------------------------------------------------------------- Mon May 16 08:24:44 UTC 2011 - gber@opensuse.org diff --git a/weechat.spec b/weechat.spec index 4b3386c..b7982cd 100644 --- a/weechat.spec +++ b/weechat.spec @@ -24,7 +24,6 @@ Summary: Portable, Fast, Light and Extensible Chat Client Source: http://www.weechat.org/files/src/weechat-%{version}.tar.bz2 Source1: weechat.desktop Patch1: weechat-0.3.3-fix-strftime.patch -Patch2: weechat-remove_build_timestamp.patch URL: http://www.weechat.org Group: Productivity/Networking/IRC License: GNU General Public License (GPL) @@ -108,7 +107,11 @@ Spell-checking support for %{name}, using the aspell library. %prep %setup -q %patch1 -p1 -%patch2 +modified="$(sed -n '/^----/n;s/ - .*$//;p;q' "%{_sourcedir}/%{name}.changes")" +DATE="\"$(date -d "${modified}" "+%%b %%e %%Y")\"" +TIME="\"$(date -d "${modified}" "+%%R")\"" +find . -name '*.[ch]' |\ + xargs sed -i "s/__DATE__/${DATE}/g;s/__TIME__/${TIME}/g" %build export CFLAGS="%{optflags}"