[weechat/el5: 63/64] Merge branch 'master' into el5

[Paul Komkoff]

commit 14bc9e63d9f5dbdf5f2e377ed0f7fa7fd7371f04
Merge: 21155e8 cf5dce2
Author: Paul P. Komkoff <i at stingr.net>
Date:   Sun Dec 2 22:23:24 2012 +0400

    Merge branch 'master' into el5
    
    Conflicts:
    	.gitignore
    	sources
    	weechat.spec

 .gitignore             |    8 +-
 sources                |    3 +-
 weechat-combined.patch |  752 ++++++++++++++++++++++++++++++++++++++++++++++++
 weechat.spec           |  130 +++++++--
 4 files changed, 865 insertions(+), 28 deletions(-)
---
diff --cc weechat.spec
index 319eac4,5d58105..5d77879
--- a/weechat.spec
+++ b/weechat.spec
@@@ -1,16 -1,17 +1,18 @@@
  Name:      weechat
  Summary:   Portable, fast, light and extensible IRC client
- Version:   0.2.6.2
- Release:   1%{?dist}
- Source:    http://weechat.flashtux.org/download/%{name}-%{version}.tar.bz2
- Patch0:    %{name}-%{version}-pie-rollup.patch.bz2
- URL:       http://weechat.flashtux.org
+ Version:   0.3.9.2
+ Release:   2%{?dist}
+ Source:    http://weechat.org/files/src/%{name}-%{version}.tar.bz2
+ Patch0:    weechat-combined.patch
+ URL:       http://weechat.org
  Group:     Applications/Communications
- BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
  License:   GPLv3
- BuildRequires: ncurses-devel python-devel perl ruby-devel 
- BuildRequires: gnutls-devel lua-devel aspell-devel
++BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+ BuildRequires: ncurses-devel python-devel perl-devel ruby-devel 
+ BuildRequires: gnutls-devel lua-devel enchant-devel
  BuildRequires: docbook-style-xsl gettext ruby
+ BuildRequires: cmake perl-ExtUtils-Embed tcl-devel
+ BuildRequires: libcurl-devel zlib-devel pkgconfig
  
  %description
  WeeChat (Wee Enhanced Environment for Chat) is a portable, fast, light and
@@@ -32,16 -41,12 +42,11 @@@ make VERBOSE=1 %{?_smp_mflags
  %install
  rm -rf $RPM_BUILD_ROOT
  make install DESTDIR="$RPM_BUILD_ROOT"
--
- find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
- 
- # This hardcoded docdir=... in Makefile.am is crap
- 
- mv $RPM_BUILD_ROOT%{_docdir}/%{name}/html .
- mv $RPM_BUILD_ROOT%{_docdir}/%{name}/weechat_quickstart* .
- 
  %find_lang %name
  
+ %check
+ ctest
+ 
  %clean
  rm -rf $RPM_BUILD_ROOT