Accepting request 52501 from home:gberh:branches:server:irc

Reviewed OK

OBS-URL: https://build.opensuse.org/request/show/52501
OBS-URL: https://build.opensuse.org/package/show/server:irc/weechat?expand=0&rev=29

weechat-0.3.3-fix-strftime.patch

@@ -0,0 +1,11 @@
+diff -urN weechat-0.3.3.orig/src/plugins/scripts/ruby/weechat-ruby.c weechat-0.3.3/src/plugins/scripts/ruby/weechat-ruby.c
+--- weechat-0.3.3.orig/src/plugins/scripts/ruby/weechat-ruby.c	2010-06-21 12:33:42.000000000 +0200
++++ weechat-0.3.3/src/plugins/scripts/ruby/weechat-ruby.c	2010-11-08 16:33:02.000000000 +0100
+@@ -32,6 +32,7 @@
+ #include <stdarg.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
++#include <time.h>
+ 
+ #include "../../weechat-plugin.h"
+ #include "../script.h"

weechat-0.3.3-remove-date-time.patch

@@ -0,0 +1,115 @@
+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)
+     {

weechat-fix-strftime.patch

@@ -1,10 +0,0 @@
---- src/plugins/scripts/ruby/weechat-ruby.c.orig	2010-06-21 12:33:42.000000000 +0200
-+++ src/plugins/scripts/ruby/weechat-ruby.c	2010-08-08 10:58:29.000000000 +0200
-@@ -54,6 +54,7 @@
- #define RSTRING_PTR(s) RSTRING(s)->ptr
- #endif
- 
-+#include <time.h>
- 
- WEECHAT_PLUGIN_NAME(RUBY_PLUGIN_NAME);
- WEECHAT_PLUGIN_DESCRIPTION("Ruby plugin for WeeChat");

weechat.changes

@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Mon Nov  8 11:48:18 UTC 2010 - gber@opensuse.org
+
+- cleanup
+  * added specfile header
+  * added more accurate summary and description
+  * removed support for obsolete openSUSE versions
+  * split off -lang subpackage
+  * added patch to remove __DATE__ and __TIME__ macros
+  * enabled make output
+  * build with $RPM_OPT_FLAGS
+
 -------------------------------------------------------------------
 Mon Oct 11 19:16:10 UTC 2010 - gber@opensuse.org
 

weechat.spec

@@ -1,17 +1,30 @@
-# norootforbuild
+#
+# spec file for package weechat (Version 0.3.3)
+#
+# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
 
-%if 0%{?!_without_lua:1} && 0%{?suse_version:1}0 && 0%{suse_version} < 920
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
-%else
+#
-%define with_lua 1
+
-%endif
+# norootforbuild
 
 Name:           weechat
 Version:        0.3.3
 Release:        0
-Summary:		Portable, Fast, Light and Extensible IRC Client
+Summary:        Portable, Fast, Light and Extensible Chat Client
 Source:         http://www.weechat.org/files/src/weechat-%{version}.tar.bz2
 Source1:        weechat.desktop
-Patch1:			weechat-fix-strftime.patch
+Patch1:         weechat-0.3.3-fix-strftime.patch
+Patch2:         weechat-0.3.3-remove-date-time.patch
 URL:            http://www.weechat.org
 Group:          Productivity/Networking/IRC
 License:        GNU General Public License (GPL)
@@ -19,12 +32,7 @@ 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++
-%if %{?with_lua:1}0
+BuildRequires:  lua-devel ruby-devel
-BuildRequires:	lua-devel
-%endif
-%if 0%{suse_version} >= 1000
-BuildRequires:	ruby-devel
-%endif
 BuildRequires:  tcl-devel
 BuildRequires:  lzo-devel libgpg-error libgcrypt
 BuildRequires:  libgpg-error-devel libgcrypt-devel
@@ -38,10 +46,16 @@ Requires:       licenses
 %endif
 
 %description
-WeeChat (Wee Enhanced Environment for Chat) is a fast and light IRC client
+WeeChat (Wee Enhanced Environment for Chat) is a fast and light cross-platform
-for many operating systems. Everything can be done with a keyboard, and it
+chat environment. It can be entirely controlled with the keyboard, has a
-is customizable and extensible with scripts. Many GUIs are available (Curses,
+plugin-based architecture and is customizable and extensible with scripts in
-GTK, and Qt). It is compliant with RFCs 1459, 2810, 2811, 2812, and 2813.
+several scripting languages.
+
+Authors:
+--------
+    Sebastien Helleu <flashcode@flashtux.org>
+
+%lang_package
 
 %package devel
 Summary:        Development Environment for %{name} Plugins
@@ -51,7 +65,6 @@ Requires:		%{name} = %{version}-%{release}
 %description devel
 Development environment for authoring %{name} plugins.
 
-%if %{?with_lua:1}0
 %package lua
 Summary:        Lua Scripting Support for %{name}
 Group:          Productivity/Networking/IRC
@@ -59,7 +72,6 @@ Requires:		%{name} = %{version}-%{release}
 
 %description lua
 Support for %{name} scripts written in the Lua language.
-%endif
 
 %package perl
 Summary:        Perl Scripting Support for %{name}
@@ -103,14 +115,18 @@ Spell-checking support for %{name}, using the aspell library.
 
 %prep
 %setup -q
-%patch1
+%patch1 -p1
+%patch2 -p1
 
 %build
+export CFLAGS="%{optflags}"
 %__mkdir build
 pushd build
-cmake -DCMAKE_INSTALL_PREFIX="%{_prefix}" -DLIBDIR="%{_libdir}" \
+cmake \
-	-DPYTHON_LIBRARY="%{_libdir}/libpython%{py_ver}.so" VERBOSE=1 ..
+    -DCMAKE_INSTALL_PREFIX="%{_prefix}" \
-%__make %{?jobs:-j%{jobs}}
+    -DLIBDIR="%{_libdir}" \
+    -DPYTHON_LIBRARY="%{_libdir}/libpython%{py_ver}.so" ..
+%__make %{?_smp_flags} VERBOSE=1
 popd #build
 
 %install
@@ -132,7 +148,7 @@ test -e "$h" && %__ln_s -f "$h" COPYING
 %clean
 %__rm -rf "%{buildroot}"
 
-%files -f "%{name}.lang"
+%files
 %defattr(-,root,root)
 %doc AUTHORS ChangeLog COPYING NEWS README
 %{_bindir}/weechat-curses
@@ -148,16 +164,16 @@ test -e "$h" && %__ln_s -f "$h" COPYING
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/pixmaps/%{name}.png
 
+%files -f "%{name}.lang" lang
+
 %files devel
 %defattr(-,root,root)
 %{_includedir}/weechat
 %{_libdir}/pkgconfig/weechat.pc
 
-%if %{?with_lua:1}0
 %files lua
 %defattr(-,root,root)
 %{_libdir}/weechat/plugins/lua.so
-%endif
 
 %files perl
 %defattr(-,root,root)
@@ -180,8 +196,3 @@ test -e "$h" && %__ln_s -f "$h" COPYING
 %{_libdir}/weechat/plugins/aspell.so
 
 %changelog
-
-# Local Variables:
-# mode: rpm-spec
-# tab-width: 3
-# End: