[libcommuni/el6: 3/3] update to new upstream version 1.2.0

[Jan Kaluža]

commit f30c390f5383246180c6930a2742cb3b88d5b6e3
Author: Jan Kaluza <hanzz.k at gmail.com>
Date:   Wed Oct 10 08:01:39 2012 +0200

    update to new upstream version 1.2.0
    
    - Do not build tests for examples when examples are disabled

 libcommuni.spec |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)
---
diff --git a/libcommuni.spec b/libcommuni.spec
index 58ab3e8..fad3128 100644
--- a/libcommuni.spec
+++ b/libcommuni.spec
@@ -10,6 +10,9 @@ URL:            http://communi.github.com
 # After updating source, update tardirname too.
 Source0:        http://github.com/communi/communi/tarball/v%{version}/communi-%{version}.tar.gz
 Source1:        communi.desktop
+# Backported from upstream, do not build tests for examples
+# when examples are disabled.
+Patch0:         libcommuni-no-examples.patch
 %if 0%{?rhel} > 0 && 0%{?rhel} <= 6
 BuildRequires:  qt4-devel
 %else
@@ -47,6 +50,7 @@ Communi is a cross-platform IRC client library written with Qt 4.
 
 %prep
 %setup -q -n %{tardirname}
+%patch0 -p1 -b .noexamples
 
 %build
 # examples don't build with older Qt versions.
@@ -69,12 +73,14 @@ LD_LIBRARY_PATH=./lib ./tests/auto/ircmessage/ircmessage
 
 %install
 make INSTALL_ROOT=%{buildroot} install
+%if 0%{?rhel} > 6 || 0%{?fedora} > 15
 # Remove communi.desktop installed by make, because it must be installed
 # using desktop-file-install
 rm -f %{buildroot}%{_datadir}/applications/communi.desktop
 desktop-file-install \
 --dir=%{buildroot}%{_datadir}/applications \
 %{SOURCE1}
+%endif
 
 %post -p /sbin/ldconfig
 
@@ -84,6 +90,7 @@ desktop-file-install \
 %defattr(-,root,root,-)
 %doc COPYING AUTHORS README CHANGELOG
 %{_libdir}/libCommuni.so.*
+%{_libdir}/qt4/plugins/communi
 
 %files devel
 %defattr(-,root,root,-)
@@ -100,7 +107,6 @@ desktop-file-install \
 %files -n communi
 %doc doc/
 %{_bindir}/communi
-%{_libdir}/qt4/plugins/communi
 %{_datadir}/applications/communi.desktop
 %{_datadir}/pixmaps/communi.png
 %endif
@@ -108,6 +114,7 @@ desktop-file-install \
 %changelog
 * 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