From 9a54c92f1ea883616290ac6988e375a74a5eda2cac74724c0bb4a6c6e3cea80c Mon Sep 17 00:00:00 2001 From: Pascal Bleser Date: Sun, 16 Jan 2011 15:23:34 +0000 Subject: [PATCH 1/4] 0.3.4 OBS-URL: https://build.opensuse.org/package/show/server:irc/weechat?expand=0&rev=30 --- weechat-0.3.3.tar.bz2 | 3 - ...ch => weechat-0.3.4-remove-date-time.patch | 96 ++++++++----------- weechat-0.3.4.tar.bz2 | 3 + weechat.changes | 13 +++ weechat.spec | 41 ++++---- 5 files changed, 74 insertions(+), 82 deletions(-) delete mode 100644 weechat-0.3.3.tar.bz2 rename weechat-0.3.3-remove-date-time.patch => weechat-0.3.4-remove-date-time.patch (50%) create mode 100644 weechat-0.3.4.tar.bz2 diff --git a/weechat-0.3.3.tar.bz2 b/weechat-0.3.3.tar.bz2 deleted file mode 100644 index 56a244c..0000000 --- a/weechat-0.3.3.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:02113765aa91f10302f38f9f4cd29ea57355bee5e2fdb98c86ae70f64b6cc77c -size 1761944 diff --git a/weechat-0.3.3-remove-date-time.patch b/weechat-0.3.4-remove-date-time.patch similarity index 50% rename from weechat-0.3.3-remove-date-time.patch rename to weechat-0.3.4-remove-date-time.patch index a279831..81cb3f3 100644 --- a/weechat-0.3.3-remove-date-time.patch +++ b/weechat-0.3.4-remove-date-time.patch @@ -1,49 +1,6 @@ -diff -urN weechat-0.3.3.orig/src/core/wee-backtrace.c weechat-0.3.3/src/core/wee-backtrace.c ---- weechat-0.3.3.orig/src/core/wee-backtrace.c 2010-06-20 14:14:48.000000000 +0200 -+++ weechat-0.3.3/src/core/wee-backtrace.c 2010-11-08 01:20:50.000000000 +0100 -@@ -164,8 +164,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); -diff -urN weechat-0.3.3.orig/src/core/weechat.c weechat-0.3.3/src/core/weechat.c ---- weechat-0.3.3.orig/src/core/weechat.c 2010-07-12 10:56:19.000000000 +0200 -+++ weechat-0.3.3/src/core/weechat.c 2010-11-08 01:20:50.000000000 +0100 -@@ -98,10 +98,10 @@ - string_iconv_fprintf (stdout, "\n"); - string_iconv_fprintf (stdout, - /* TRANSLATORS: "%s %s" after "compiled on" is date and time */ -- _("%s Copyright (C) 2003-2010, compiled on %s %s\n" -+ _("%s Copyright (C) 2003-2010\n" - "Developed by Sebastien Helleu " - "- %s"), -- PACKAGE_STRING, __DATE__, __TIME__, WEECHAT_WEBSITE); -+ PACKAGE_STRING, WEECHAT_WEBSITE); - string_iconv_fprintf (stdout, "\n\n"); - string_iconv_fprintf (stdout, - _("Usage: %s [option...] [plugin:option...]\n"), -diff -urN weechat-0.3.3.orig/src/core/weechat.h weechat-0.3.3/src/core/weechat.h ---- weechat-0.3.3.orig/src/core/weechat.h 2010-06-25 13:35:39.000000000 +0200 -+++ weechat-0.3.3/src/core/weechat.h 2010-11-08 01:20:50.000000000 +0100 -@@ -62,7 +62,7 @@ - /* license */ - - #define WEECHAT_LICENSE_TEXT \ -- "WeeChat " PACKAGE_VERSION " Copyright (C) 2003-2010, compiled on " __DATE__ " " __TIME__ \ -+ "WeeChat " PACKAGE_VERSION " Copyright (C) 2003-2010" \ - "\nDeveloped by Sebastien Helleu - " WEECHAT_WEBSITE "\n\n" \ - "WeeChat is free software; you can redistribute it and/or modify\n" \ - "it under the terms of the GNU General Public License as published by\n" \ -diff -urN weechat-0.3.3.orig/src/core/wee-command.c weechat-0.3.3/src/core/wee-command.c ---- weechat-0.3.3.orig/src/core/wee-command.c 2010-07-28 11:30:15.000000000 +0200 -+++ weechat-0.3.3/src/core/wee-command.c 2010-11-08 01:20:50.000000000 +0100 -@@ -3928,11 +3928,8 @@ +--- src/core/wee-command.c.orig 2011-01-16 16:12:43.000000000 +0100 ++++ src/core/wee-command.c 2011-01-16 16:13:34.000000000 +0100 +@@ -3898,11 +3898,8 @@ if (translated_string) { snprintf (string, sizeof (string), @@ -57,7 +14,7 @@ diff -urN weechat-0.3.3.orig/src/core/wee-command.c weechat-0.3.3/src/core/wee-c input_data (buffer, string); if (weechat_upgrade_count > 0) { -@@ -3948,11 +3945,8 @@ +@@ -3918,11 +3915,8 @@ else { snprintf (string, sizeof (string), @@ -71,7 +28,7 @@ diff -urN weechat-0.3.3.orig/src/core/wee-command.c weechat-0.3.3/src/core/wee-c input_data (buffer, string); if (weechat_upgrade_count > 0) { -@@ -3968,14 +3962,9 @@ +@@ -3938,14 +3932,9 @@ } else { @@ -87,23 +44,48 @@ diff -urN weechat-0.3.3.orig/src/core/wee-command.c weechat-0.3.3/src/core/wee-c GUI_COLOR(GUI_COLOR_CHAT_DELIMITERS)); if (weechat_upgrade_count > 0) { -diff -urN weechat-0.3.3.orig/src/core/wee-log.c weechat-0.3.3/src/core/wee-log.c ---- weechat-0.3.3.orig/src/core/wee-log.c 2010-06-22 18:50:11.000000000 +0200 -+++ weechat-0.3.3/src/core/wee-log.c 2010-11-08 01:20:50.000000000 +0100 -@@ -114,8 +114,8 @@ +--- src/core/wee-log.c.orig 2011-01-16 16:12:05.000000000 +0100 ++++ src/core/wee-log.c 2011-01-16 16:12:22.000000000 +0100 +@@ -114,8 +114,6 @@ "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); } /* -diff -urN weechat-0.3.3.orig/src/plugins/plugin-api.c weechat-0.3.3/src/plugins/plugin-api.c ---- weechat-0.3.3.orig/src/plugins/plugin-api.c 2010-06-20 14:19:11.000000000 +0200 -+++ weechat-0.3.3/src/plugins/plugin-api.c 2010-11-08 12:19:52.000000000 +0100 +--- src/core/wee-backtrace.c.orig 2011-01-16 16:13:39.000000000 +0100 ++++ src/core/wee-backtrace.c 2011-01-16 16:13:49.000000000 +0100 +@@ -161,8 +161,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/core/weechat.c.orig 2011-01-16 16:12:27.000000000 +0100 ++++ src/core/weechat.c 2011-01-16 16:12:38.000000000 +0100 +@@ -113,11 +113,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/plugins/plugin-api.c.orig 2011-01-16 16:13:55.000000000 +0100 ++++ src/plugins/plugin-api.c 2011-01-16 16:14:16.000000000 +0100 @@ -287,7 +287,7 @@ } else if (string_strcasecmp (info_name, "date") == 0) diff --git a/weechat-0.3.4.tar.bz2 b/weechat-0.3.4.tar.bz2 new file mode 100644 index 0000000..df35ce6 --- /dev/null +++ b/weechat-0.3.4.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:391762a8d3a18e236fd6bdceae126af01c55be4605b3e1274f8d59f8def9cbd4 +size 1936679 diff --git a/weechat.changes b/weechat.changes index e808087..b2de529 100644 --- a/weechat.changes +++ b/weechat.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Sun Jan 16 15:08:54 UTC 2011 - pascal.bleser@opensuse.org + +- update to 0.3.4: + * adds 256-color support + * adds IRC proxy support + * adds redirection of IRC commands + * adds new /notify command + * adds the rmodifier plugin + * adds regular expression support for highlights + * adds sharing of the input line between buffers + * many bugfixes + ------------------------------------------------------------------- Mon Nov 8 11:48:18 UTC 2010 - gber@opensuse.org diff --git a/weechat.spec b/weechat.spec index eda5b2c..904828b 100644 --- a/weechat.spec +++ b/weechat.spec @@ -1,5 +1,5 @@ # -# spec file for package weechat (Version 0.3.3) +# spec file for package weechat (Version 0.3.4) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -17,26 +17,25 @@ # norootforbuild - Name: weechat -Version: 0.3.3 -Release: 1 +Version: 0.3.4 +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-0.3.3-remove-date-time.patch -Url: http://www.weechat.org +Patch2: weechat-0.3.4-remove-date-time.patch +URL: http://www.weechat.org Group: Productivity/Networking/IRC License: GNU General Public License (GPL) -BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: cmake ncurses-devel perl python-devel -BuildRequires: aspell-devel gcc glibc-devel gnutls gnutls-devel ruby -BuildRequires: gcc-c++ libstdc++-devel +BuildRoot: %{_tmppath}/build-%{name}-%{version} +BuildRequires: ncurses-devel perl python-devel cmake +BuildRequires: ruby gcc gnutls gnutls-devel glibc-devel aspell-devel +BuildRequires: libstdc++-devel gcc-c++ BuildRequires: lua-devel ruby-devel BuildRequires: tcl-devel -BuildRequires: libgcrypt libgpg-error lzo-devel -BuildRequires: libgcrypt-devel libgpg-error-devel +BuildRequires: lzo-devel libgpg-error libgcrypt +BuildRequires: libgpg-error-devel libgcrypt-devel BuildRequires: autoconf automake libtool pkgconfig %if 0%{?suse_version:1} BuildRequires: update-desktop-files @@ -52,14 +51,16 @@ 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 -License: GNU General Public License (GPL) Summary: Development Environment for %{name} Plugins Group: Development/Libraries/C and C++ Requires: %{name} = %{version}-%{release} @@ -68,7 +69,6 @@ Requires: %{name} = %{version}-%{release} Development environment for authoring %{name} plugins. %package lua -License: GNU General Public License (GPL) Summary: Lua Scripting Support for %{name} Group: Productivity/Networking/IRC Requires: %{name} = %{version}-%{release} @@ -77,7 +77,6 @@ Requires: %{name} = %{version}-%{release} Support for %{name} scripts written in the Lua language. %package perl -License: GNU General Public License (GPL) Summary: Perl Scripting Support for %{name} Group: Productivity/Networking/IRC Requires: %{name} = %{version}-%{release} @@ -86,7 +85,6 @@ Requires: %{name} = %{version}-%{release} Support for %{name} scripts written in the Perl language. %package python -License: GNU General Public License (GPL) Summary: Python Scripting Support for %{name} Group: Productivity/Networking/IRC Requires: %{name} = %{version}-%{release} @@ -95,7 +93,6 @@ Requires: %{name} = %{version}-%{release} Support for %{name} scripts written in the Python language. %package tcl -License: GNU General Public License (GPL) Summary: Tcl Scripting Support for %{name} Group: Productivity/Networking/IRC Requires: %{name} = %{version}-%{release} @@ -104,7 +101,6 @@ Requires: %{name} = %{version}-%{release} Support for %{name} scripts written in the Tcl language. %package ruby -License: GNU General Public License (GPL) Summary: Ruby Scripting Support for %{name} Group: Productivity/Networking/IRC Requires: %{name} = %{version}-%{release} @@ -113,7 +109,6 @@ Requires: %{name} = %{version}-%{release} Support for %{name} scripts written in the Ruby language. %package aspell -License: GNU General Public License (GPL) Summary: Aspell Spell-Checking Support for %{name} Group: Productivity/Networking/IRC Requires: %{name} = %{version}-%{release} @@ -124,7 +119,7 @@ Spell-checking support for %{name}, using the aspell library. %prep %setup -q %patch1 -p1 -%patch2 -p1 +%patch2 %build export CFLAGS="%{optflags}" @@ -154,7 +149,7 @@ h=/usr/share/doc/licenses/md5/$(md5sum COPYING|cut -f1 -d" ") test -e "$h" && %__ln_s -f "$h" COPYING %clean -%__rm -rf "%{buildroot}" +%{?buildroot:%__rm -rf "%{buildroot}"} %files %defattr(-,root,root) @@ -167,6 +162,8 @@ test -e "$h" && %__ln_s -f "$h" COPYING %{_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/xfer.so %doc %{_mandir}/man1/weechat-curses.1* %{_datadir}/applications/%{name}.desktop From cc289950a8ca33c4149bd4b625273de675c6faae707621fb09974e7e11b8a671 Mon Sep 17 00:00:00 2001 From: Guido Berhoerster Date: Thu, 17 Feb 2011 09:27:43 +0000 Subject: [PATCH 2/4] - added weechat-0.3.4-fix-array-overflow.patch which fixes an array overflow OBS-URL: https://build.opensuse.org/package/show/server:irc/weechat?expand=0&rev=31 --- weechat-0.3.4-fix-array-overflow.patch | 11 +++++++++++ weechat.changes | 6 ++++++ weechat.spec | 2 ++ 3 files changed, 19 insertions(+) create mode 100644 weechat-0.3.4-fix-array-overflow.patch diff --git a/weechat-0.3.4-fix-array-overflow.patch b/weechat-0.3.4-fix-array-overflow.patch new file mode 100644 index 0000000..a11886c --- /dev/null +++ b/weechat-0.3.4-fix-array-overflow.patch @@ -0,0 +1,11 @@ +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.changes b/weechat.changes index b2de529..5479873 100644 --- a/weechat.changes +++ b/weechat.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Feb 17 08:02:54 UTC 2011 - gber@opensuse.org + +- added weechat-0.3.4-fix-array-overflow.patch which fixes an + array overflow + ------------------------------------------------------------------- Sun Jan 16 15:08:54 UTC 2011 - pascal.bleser@opensuse.org diff --git a/weechat.spec b/weechat.spec index 904828b..54cc6d2 100644 --- a/weechat.spec +++ b/weechat.spec @@ -25,6 +25,7 @@ Source: http://www.weechat.org/files/src/weechat-%{version}.tar.bz2 Source1: weechat.desktop Patch1: weechat-0.3.3-fix-strftime.patch Patch2: weechat-0.3.4-remove-date-time.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) @@ -120,6 +121,7 @@ Spell-checking support for %{name}, using the aspell library. %setup -q %patch1 -p1 %patch2 +%patch3 -p1 %build export CFLAGS="%{optflags}" From c978b8e68a68c811aef542897defa18dbd47c1b6b0b54de267d765da296c50fe Mon Sep 17 00:00:00 2001 From: Marcus Rueckert Date: Tue, 22 Mar 2011 11:18:10 +0000 Subject: [PATCH 3/4] Accepting request 64760 from home:coolo:nolicenses well for now. OBS-URL: https://build.opensuse.org/request/show/64760 OBS-URL: https://build.opensuse.org/package/show/server:irc/weechat?expand=0&rev=32 --- weechat.changes | 5 +++++ weechat.spec | 7 ------- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/weechat.changes b/weechat.changes index 5479873..863dc40 100644 --- a/weechat.changes +++ b/weechat.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Mar 21 16:49:05 UTC 2011 - coolo@novell.com + +- licenses package is about to die + ------------------------------------------------------------------- Wed Feb 17 08:02:54 UTC 2011 - gber@opensuse.org diff --git a/weechat.spec b/weechat.spec index 54cc6d2..e9a089d 100644 --- a/weechat.spec +++ b/weechat.spec @@ -40,10 +40,6 @@ BuildRequires: libgpg-error-devel libgcrypt-devel BuildRequires: autoconf automake libtool pkgconfig %if 0%{?suse_version:1} BuildRequires: update-desktop-files -%if 0%{?suse_version} >= 1030 -BuildRequires: licenses -Requires: licenses -%endif %endif %description @@ -147,9 +143,6 @@ popd #build %find_lang "%{name}" -h=/usr/share/doc/licenses/md5/$(md5sum COPYING|cut -f1 -d" ") -test -e "$h" && %__ln_s -f "$h" COPYING - %clean %{?buildroot:%__rm -rf "%{buildroot}"} From e4ab328485798545db15e9603a6594bd68145a26fdb8a3c31c2a0a8b6f8a549d Mon Sep 17 00:00:00 2001 From: Guido Berhoerster Date: Wed, 23 Mar 2011 23:55:34 +0000 Subject: [PATCH 4/4] - dropped weechat-0.3.4-remove-date-time.patch, use date/time from last changelog entry rather than removing it completely - use %desktop_database_post/un OBS-URL: https://build.opensuse.org/package/show/server:irc/weechat?expand=0&rev=33 --- weechat-0.3.4-remove-date-time.patch | 97 ---------------------------- weechat.changes | 7 ++ weechat.spec | 17 ++++- 3 files changed, 22 insertions(+), 99 deletions(-) delete mode 100644 weechat-0.3.4-remove-date-time.patch diff --git a/weechat-0.3.4-remove-date-time.patch b/weechat-0.3.4-remove-date-time.patch deleted file mode 100644 index 81cb3f3..0000000 --- a/weechat-0.3.4-remove-date-time.patch +++ /dev/null @@ -1,97 +0,0 @@ ---- src/core/wee-command.c.orig 2011-01-16 16:12:43.000000000 +0100 -+++ src/core/wee-command.c 2011-01-16 16:13:34.000000000 +0100 -@@ -3898,11 +3898,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) - { -@@ -3918,11 +3915,8 @@ - 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) - { -@@ -3938,14 +3932,9 @@ - } - else - { -- gui_chat_printf (NULL, "%sWeeChat %s %s[%s%s %s %s%s]", -+ gui_chat_printf (NULL, "%sWeeChat %s %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)); - if (weechat_upgrade_count > 0) - { ---- src/core/wee-log.c.orig 2011-01-16 16:12:05.000000000 +0100 -+++ src/core/wee-log.c 2011-01-16 16:12:22.000000000 +0100 -@@ -114,8 +114,6 @@ - "with another home using \"--dir\" command line option.\n")); - exit (1); - } -- log_printf ("%s (%s %s %s)", -- PACKAGE_STRING, _("compiled on"), __DATE__, __TIME__); - } - - /* ---- src/core/wee-backtrace.c.orig 2011-01-16 16:13:39.000000000 +0100 -+++ src/core/wee-backtrace.c 2011-01-16 16:13:49.000000000 +0100 -@@ -161,8 +161,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/core/weechat.c.orig 2011-01-16 16:12:27.000000000 +0100 -+++ src/core/weechat.c 2011-01-16 16:12:38.000000000 +0100 -@@ -113,11 +113,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/plugins/plugin-api.c.orig 2011-01-16 16:13:55.000000000 +0100 -+++ src/plugins/plugin-api.c 2011-01-16 16:14:16.000000000 +0100 -@@ -287,7 +287,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 863dc40..1829a0d 100644 --- a/weechat.changes +++ b/weechat.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Mar 23 23:38:19 UTC 2011 - gber@opensuse.org + +- dropped weechat-0.3.4-remove-date-time.patch, use date/time from + last changelog entry rather than removing it completely +- use %desktop_database_post/un + ------------------------------------------------------------------- Mon Mar 21 16:49:05 UTC 2011 - coolo@novell.com diff --git a/weechat.spec b/weechat.spec index e9a089d..13309e6 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-0.3.4-remove-date-time.patch Patch3: weechat-0.3.4-fix-array-overflow.patch URL: http://www.weechat.org Group: Productivity/Networking/IRC @@ -116,8 +115,13 @@ Spell-checking support for %{name}, using the aspell library. %prep %setup -q %patch1 -p1 -%patch2 %patch3 -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" + %build export CFLAGS="%{optflags}" @@ -146,6 +150,15 @@ popd #build %clean %{?buildroot:%__rm -rf "%{buildroot}"} +%if 0%{?suse_version} >= 1140 + +%post +%desktop_database_post + +%postun +%desktop_database_postun +%endif + %files %defattr(-,root,root) %doc AUTHORS ChangeLog COPYING NEWS README