[weechat/f14: 5/5] Merge branch 'master' into f14

[Paul Komkoff]

commit 657c80e2949db4bf47952ac07557c60c8272e94a
Merge: be453b4 f3be0bd
Author: Paul P. Komkoff Jr <i at stingr.net>
Date:   Thu Jun 2 15:46:16 2011 +0400

    Merge branch 'master' into f14
    
    Conflicts:
    	weechat.spec

 .gitignore                                      |    1 +
 sources                                         |    2 +-
 weechat-cmake-paths.patch                       |  203 --------
 weechat-cmake-pie.patch                         |   69 ---
 weechat-enchant.patch => weechat-combined.patch |  563 +++++++++++++----------
 weechat-python27.patch                          |   22 -
 weechat.spec                                    |   18 +-
 7 files changed, 331 insertions(+), 547 deletions(-)
---
diff --cc weechat.spec
index 3f0e2c2,45f0e54..b88c25d
--- a/weechat.spec
+++ b/weechat.spec
@@@ -72,9 -66,12 +66,15 @@@ rm -rf $RPM_BUILD_ROO
  %{_libdir}/pkgconfig/*.pc
  
  %changelog
+ * Thu Jun  2 2011 Paul P. Komkoff Jr <i at stingr.net> - 0.3.5-1
+ - new upstream version
+ 
+ * Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.3-3
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+ 
 +* Thu Oct 14 2010 Jesse Keating <jkeating at redhat.com> - 0.3.3-2.1
 +- Rebuild for gcc bug 634757
 +
  * Sat Aug 28 2010 Paul P. Komkoff Jr <i at stingr.net> - 0.3.3-2
  - fixed cmake config to accept python27