diff --git a/weechat-0.4.1.tar.bz2 b/weechat-0.4.1.tar.bz2 deleted file mode 100644 index 2331193..0000000 --- a/weechat-0.4.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d27bed07ee2d0638c1683ad18666d478ed9a042aeeedcd0dd9ce22f1392e0ebb -size 1772500 diff --git a/weechat-0.4.2.tar.bz2 b/weechat-0.4.2.tar.bz2 new file mode 100644 index 0000000..dabf375 --- /dev/null +++ b/weechat-0.4.2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:95c4337b10f0e54192dcdaf7ce60f9bd22dfc82abd0832219b20dedd06d509dc +size 1892996 diff --git a/weechat-0.4.1-capath.diff b/weechat-capath.patch similarity index 76% rename from weechat-0.4.1-capath.diff rename to weechat-capath.patch index 1a2896e..170f888 100644 --- a/weechat-0.4.1-capath.diff +++ 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.1/src/core/wee-config.c +Index: weechat-0.4.2/src/core/wee-config.c =================================================================== ---- weechat-0.4.1.orig/src/core/wee-config.c -+++ weechat-0.4.1/src/core/wee-config.c +--- weechat-0.4.2.orig/src/core/wee-config.c ++++ weechat-0.4.2/src/core/wee-config.c @@ -61,7 +61,6 @@ #include "../gui/gui-window.h" #include "../plugins/plugin.h" @@ -21,20 +21,20 @@ Index: weechat-0.4.1/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; -@@ -2961,7 +2960,7 @@ config_weechat_init_options () +@@ -3084,7 +3083,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)"), -- NULL, 0, 0, "/etc/ssl/certs/ca-certificates.crt", NULL, 0, NULL, NULL, +- NULL, 0, 0, CA_FILE, NULL, 0, NULL, NULL, + NULL, 0, 0, NULL, NULL, 1, NULL, NULL, &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.1/src/core/wee-network.c +Index: weechat-0.4.2/src/core/wee-network.c =================================================================== ---- weechat-0.4.1.orig/src/core/wee-network.c -+++ weechat-0.4.1/src/core/wee-network.c -@@ -87,6 +87,12 @@ network_set_gnutls_ca_file () +--- weechat-0.4.2.orig/src/core/wee-network.c ++++ weechat-0.4.2/src/core/wee-network.c +@@ -103,6 +103,12 @@ network_set_gnutls_ca_file () } free (ca_path); } diff --git a/weechat.changes b/weechat.changes index 669b352..e8e4255 100644 --- a/weechat.changes +++ b/weechat.changes @@ -1,3 +1,40 @@ +------------------------------------------------------------------- +Mon Oct 7 10:09:38 UTC 2013 - gber@opensuse.org + +- remove support for < 12.2 + +------------------------------------------------------------------- +Mon Oct 7 07:34:16 UTC 2013 - gber@opensuse.org + +- update to version 0.4.2 + * rename binary from "weechat-curses" to "weechat" (with symbolic + link "weechat-curses" for compatibility) + * add secured data (encryption of passwords or private data), new + command /secure, new file sec.conf + * search of regular expression in buffer with text emphasis, in + prefixes, messages or both + * add option "scroll_beyond_end" for command /window + * add optional buffer context in bar items (for example to + display bitlbee nicklist in a root bar) + * new options weechat.look.hotlist_{prefix|suffix} + * new option weechat.look.key_bind_safe to prevent any key + binding error from user + * new option weechat.network.proxy_curl to use a proxy when + downloading URLs with curl + * display day change message dynamically + * support of wildcards in IRC commands (de)op/halfop/voice + * new option irc.look.notice_welcome_redirect to redirect channel + welcome notices to the channel buffer + * new option irc.look.nick_color_hash: new hash algorithm to find + nick colors (variant of djb2) + * add info about things defined by a script in the detailed view + of script (/script show) + * support of "enchant" library in aspell plugin + * many bugs fixed. +- rebased weechat-0.4.1-capath.diff and renamed to + weechat-capath.patch +- build aspell plugin with enchant support + ------------------------------------------------------------------- Thu Sep 5 18:53:22 CEST 2013 - mls@suse.de diff --git a/weechat.spec b/weechat.spec index 937f6f4..4e21cf3 100644 --- a/weechat.spec +++ b/weechat.spec @@ -16,20 +16,16 @@ # -%if 0%{?suse_version} > 1140 -%define guile_ver 2.0 -%endif - Name: weechat -Version: 0.4.1 +Version: 0.4.2 Release: 0 Summary: Portable, Fast, Light and Extensible Chat Client License: GPL-3.0+ Group: Productivity/Networking/IRC Source: http://www.weechat.org/files/src/weechat-%{version}.tar.bz2 Source1: weechat.desktop -# PATCH-FIX-UPSTREAM https://savannah.nongnu.org/patch/index.php?8153 lnussel@suse.de -- use system's default certificate store -Patch0: weechat-0.4.1-capath.diff +# 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 Url: http://www.weechat.org BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: cmake @@ -41,27 +37,21 @@ BuildRequires: ncurses-devel BuildRequires: perl BuildRequires: pkg-config BuildRequires: python-devel -%if 0%{?suse_version} > 1210 BuildRequires: lua51-devel -%else -BuildRequires: lua-devel -%endif BuildRequires: ruby-devel -%if 0%{?suse_version} > 1210 BuildRequires: libgnutls-devel -%else -BuildRequires: gnutls-devel -%endif -BuildRequires: aspell-devel +BuildRequires: enchant-devel BuildRequires: guile-devel BuildRequires: libgcrypt-devel BuildRequires: libgpg-error-devel BuildRequires: lzo-devel BuildRequires: ruby-devel BuildRequires: tcl-devel -%if 0%{?suse_version:1} +BuildRequires: asciidoc +BuildRequires: source-highlight +BuildRequires: docbook5-xsl-stylesheets +BuildRequires: libxslt-tools BuildRequires: update-desktop-files -%endif BuildRequires: hicolor-icon-theme Requires: hicolor-icon-theme @@ -154,11 +144,10 @@ pushd build cmake \ -DCMAKE_INSTALL_PREFIX="%{_prefix}" \ -DLIBDIR="%{_libdir}" \ -%if 0%{?suse_version} > 1140 - -DGUILE_INCLUDE_DIR="%{_includedir}/guile/2.0" \ - -DGUILE_LIBRARY="%{_libdir}/libguile-%{guile_ver}.so" \ -%endif -DPYTHON_LIBRARY="%{_libdir}/libpython%{py_ver}.so" \ + -DENABLE_ENCHANT=ON \ + -DENABLE_DOC=ON \ + -DENABLE_MAN=ON \ .. make %{?_smp_flags} VERBOSE=1 popd #build @@ -173,12 +162,9 @@ install -D -m 0644 "%{SOURCE1}" "%{buildroot}%{_datadir}/applications/%{name}.de %suse_update_desktop_file -r "%{name}" Network IRCClient %endif -%find_lang "%{name}" +mv "%{buildroot}%{_datadir}/doc/weechat" html -%clean -%{?buildroot:rm -rf "%{buildroot}"} - -%if 0%{?suse_version} >= 1140 +%find_lang "%{name}" --with-man %post %desktop_database_post @@ -187,12 +173,12 @@ install -D -m 0644 "%{SOURCE1}" "%{buildroot}%{_datadir}/applications/%{name}.de %postun %desktop_database_postun %icon_theme_cache_postun -%endif %files %defattr(-,root,root) -%doc AUTHORS ChangeLog COPYING NEWS README +%doc AUTHORS ChangeLog COPYING NEWS README html/ %{_bindir}/weechat-curses +%{_bindir}/weechat %dir %{_libdir}/weechat %dir %{_libdir}/weechat/plugins %{_libdir}/weechat/plugins/alias.so @@ -204,8 +190,8 @@ install -D -m 0644 "%{SOURCE1}" "%{buildroot}%{_datadir}/applications/%{name}.de %{_libdir}/weechat/plugins/rmodifier.so %{_libdir}/weechat/plugins/script.so %{_libdir}/weechat/plugins/xfer.so -%doc %{_mandir}/man1/weechat-curses.1* -%{_datadir}/applications/%{name}.desktop +%{_mandir}/man1/weechat.1* +%{_datadir}/applications/weechat.desktop %{_datadir}/icons/hicolor/*/apps/weechat.png %files -f "%{name}.lang" lang