forked from pool/weechat
Accepting request 65904 from server:irc
Accepted submit request 65904 from user licensedigger OBS-URL: https://build.opensuse.org/request/show/65904 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/weechat?expand=0&rev=4
This commit is contained in:
commit
c56bc4237a
@ -1,115 +0,0 @@
|
||||
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 <flashcode@flashtux.org> "
|
||||
"- %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 <flashcode@flashtux.org> - " 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 @@
|
||||
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)
|
||||
{
|
||||
@@ -3948,11 +3945,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)
|
||||
{
|
||||
@@ -3968,14 +3962,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)
|
||||
{
|
||||
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 @@
|
||||
"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
|
||||
@@ -287,7 +287,7 @@
|
||||
}
|
||||
else if (string_strcasecmp (info_name, "date") == 0)
|
||||
{
|
||||
- return __DATE__;
|
||||
+ return "";
|
||||
}
|
||||
else if (string_strcasecmp (info_name, "dir_separator") == 0)
|
||||
{
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:02113765aa91f10302f38f9f4cd29ea57355bee5e2fdb98c86ae70f64b6cc77c
|
||||
size 1761944
|
11
weechat-0.3.4-fix-array-overflow.patch
Normal file
11
weechat-0.3.4-fix-array-overflow.patch
Normal file
@ -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,
|
3
weechat-0.3.4.tar.bz2
Normal file
3
weechat-0.3.4.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:391762a8d3a18e236fd6bdceae126af01c55be4605b3e1274f8d59f8def9cbd4
|
||||
size 1936679
|
@ -1,3 +1,34 @@
|
||||
-------------------------------------------------------------------
|
||||
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
|
||||
|
||||
- licenses package is about to die
|
||||
|
||||
-------------------------------------------------------------------
|
||||
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
|
||||
|
||||
- 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
|
||||
|
||||
|
63
weechat.spec
63
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,33 +17,28 @@
|
||||
|
||||
# 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
|
||||
Patch3: weechat-0.3.4-fix-array-overflow.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
|
||||
%if 0%{?suse_version} >= 1030
|
||||
BuildRequires: licenses
|
||||
Requires: licenses
|
||||
%endif
|
||||
%endif
|
||||
|
||||
%description
|
||||
@ -52,14 +47,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 <flashcode@flashtux.org>
|
||||
|
||||
|
||||
%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 +65,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 +73,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 +81,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 +89,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 +97,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 +105,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 +115,13 @@ Spell-checking support for %{name}, using the aspell library.
|
||||
%prep
|
||||
%setup -q
|
||||
%patch1 -p1
|
||||
%patch2 -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")\""
|
||||
find . -name '*.[ch]' |\
|
||||
xargs sed -i "s/__DATE__/${DATE}/g;s/__TIME__/${TIME}/g"
|
||||
|
||||
|
||||
%build
|
||||
export CFLAGS="%{optflags}"
|
||||
@ -150,11 +147,17 @@ 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
|
||||
%__rm -rf "%{buildroot}"
|
||||
%{?buildroot:%__rm -rf "%{buildroot}"}
|
||||
|
||||
%if 0%{?suse_version} >= 1140
|
||||
|
||||
%post
|
||||
%desktop_database_post
|
||||
|
||||
%postun
|
||||
%desktop_database_postun
|
||||
%endif
|
||||
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
@ -167,6 +170,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
|
||||
|
Loading…
Reference in New Issue
Block a user