[libcommuni/el6: 2/2] merge with master

[Jan Kaluža]

commit 8331deb4fa286a8df9265ff1403f58fcf7348e0e
Merge: bc88fdc b415cd4
Author: Jan Kaluza <hanzz.k at gmail.com>
Date:   Mon Dec 3 17:11:19 2012 +0100

    merge with master

 libcommuni-encoding-perf.patch |   85 ++++++++++++++++++++++++++++++++++++++++
 libcommuni.spec                |    7 +++-
 2 files changed, 91 insertions(+), 1 deletions(-)
---
diff --cc libcommuni.spec
index fad3128,853afdc..eacfa0e
--- a/libcommuni.spec
+++ b/libcommuni.spec
@@@ -10,9 -10,7 +10,10 @@@ URL:            http://communi.github.c
  # After updating source, update tardirname too.
  Source0:        http://github.com/communi/communi/tarball/v%{version}/communi-%{version}.tar.gz
  Source1:        communi.desktop
 -Patch0:         libcommuni-encoding-perf.patch
 +# Backported from upstream, do not build tests for examples
 +# when examples are disabled.
 +Patch0:         libcommuni-no-examples.patch
++Patch1:         libcommuni-encoding-perf.patch
  %if 0%{?rhel} > 0 && 0%{?rhel} <= 6
  BuildRequires:  qt4-devel
  %else
@@@ -50,7 -48,7 +51,8 @@@ Communi is a cross-platform IRC client 
  
  %prep
  %setup -q -n %{tardirname}
 -%patch0 -p1
 +%patch0 -p1 -b .noexamples
++%patch1 -p1
  
  %build
  # examples don't build with older Qt versions.
@@@ -112,9 -108,11 +114,12 @@@ desktop-file-install 
  %endif
  
  %changelog
+ * Mon Dec 03 2012 Jan Kaluza <jkaluza at redhat.com> - 1.2.0-2
+ - add upstream fix to parser performance bottleneck caused by encoding settings
+ 
  * Tue Oct 09 2012 Jan Kaluza <jkaluza at redhat.com> - 1.2.0-1
  - update to new upstream version 1.2.0
 +- Do not build tests for examples when examples are disabled
  
  * Wed Sep 05 2012 Jan Kaluza <jkaluza at redhat.com> - 1.1.2-1
  - Initial Fedora packaging