[libcommuni] update to new upstream version 2.1.1

[Jan Kaluža]

commit 1d6bfb702ba71ec11ae565139950c10222d2aeae
Author: Jan Kaluza <hanzz.k at gmail.com>
Date:   Thu Jun 6 10:49:34 2013 +0200

    update to new upstream version 2.1.1
    
    - remove communi subpackage - it is in separate package now

 .gitignore                     |    1 +
 communi.desktop                |   12 ------
 libcommuni-encoding-perf.patch |   85 ----------------------------------------
 libcommuni.spec                |   66 +++++--------------------------
 sources                        |    2 +-
 5 files changed, 12 insertions(+), 154 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d888059..459ec09 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /communi-1.1.2.tar.gz
 /communi-1.2.0.tar.gz
 /v1.2.1.tar.gz
+/v2.1.1.tar.gz
diff --git a/libcommuni.spec b/libcommuni.spec
index c5ba335..17a7cc5 100644
--- a/libcommuni.spec
+++ b/libcommuni.spec
@@ -1,19 +1,13 @@
 Name:           libcommuni
-Version:        1.2.1
-Release:        2%{?dist}
+Version:        2.1.1
+Release:        1%{?dist}
 Summary:        Cross-platform IRC client library written with Qt 4
 Group:          System Environment/Libraries
 License:        LGPLv2+
 URL:            http://communi.github.com
-Source0:        http://github.com/communi/communi/archive/v%{version}.tar.gz
-Source1:        communi.desktop
-%if 0%{?rhel} > 0 && 0%{?rhel} <= 6
-BuildRequires:  qt4-devel
-%else
+Source0:        https://github.com/communi/communi/archive/v%{version}.tar.gz
 BuildRequires:  qt-devel
-%endif
 BuildRequires:  libicu-devel
-BuildRequires:  desktop-file-utils
 Obsoletes: libircclient-qt < 0.5.0-5
 
 %description
@@ -28,50 +22,18 @@ Obsoletes: libircclient-qt-devel < 0.5.0-5
 %description devel
 Communi is a cross-platform IRC client library written with Qt 4.
 
-# For communi package, Qt is too old on <=RHEL6
-%if 0%{?rhel} > 6 || 0%{?fedora} > 15
-
-%package -n communi
-Summary:        Cross-platform IRC client library written with Qt 4 (development files)
-Group:          Development/Libraries
-Requires:       %{name}%{?_isa} = %{version}-%{release}
-Obsoletes: libircclient-qt-devel < 0.5.0-5
-
-%description -n communi
-Communi is a cross-platform IRC client library written with Qt 4.
-
-%endif
-
 %prep
-%setup -q -n communi-%{version}
+%setup -q
 
 %build
-# examples don't build with older Qt versions.
-%if 0%{?rhel} > 6 || 0%{?fedora} > 15
-qmake-qt4 -config verbose -config no_rpath
-%else
 qmake-qt4 -config verbose -config no_examples -config no_rpath
-%endif
-
 make %{_smp_mflags}
 
 %check
-# qmake-qt4 does not generate 'make check' on epel6
-LD_LIBRARY_PATH=./lib ./tests/auto/ircdecoder/ircdecoder
-LD_LIBRARY_PATH=./lib ./tests/auto/ircsender/ircsender
-LD_LIBRARY_PATH=./lib ./tests/auto/ircparser/ircparser
-LD_LIBRARY_PATH=./lib ./tests/auto/ircsession/ircsession
-LD_LIBRARY_PATH=./lib ./tests/auto/irccommand/irccommand
-LD_LIBRARY_PATH=./lib ./tests/auto/ircmessage/ircmessage
+LD_LIBRARY_PATH=%{buildroot}/%{_libdir} make check
 
 %install
 make INSTALL_ROOT=%{buildroot} install
-# 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}
 
 %post -p /sbin/ldconfig
 
@@ -79,7 +41,7 @@ desktop-file-install \
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING AUTHORS README CHANGELOG
+%doc LICENSE AUTHORS README CHANGELOG
 %{_libdir}/libCommuni.so.*
 
 %files devel
@@ -89,20 +51,12 @@ desktop-file-install \
 %{_libdir}/libCommuni.so
 %{_libdir}/qt4/mkspecs/features/communi-config.prf
 %{_libdir}/qt4/mkspecs/features/communi.prf
-%if 0%{?fedora} || 0%{?rhel} >= 7
-%{_libdir}/qt4/imports/Communi/
-%endif
-
-%if 0%{?rhel} > 6 || 0%{?fedora} > 15
-%files -n communi
-%doc doc/
-%{_bindir}/communi
-%{_libdir}/qt4/plugins/communi
-%{_datadir}/applications/communi.desktop
-%{_datadir}/pixmaps/communi.png
-%endif
 
 %changelog
+* Mon May 27 2013 Jan Kaluza <jkaluza at redhat.com> - 2.1.1-1
+- update to new upstream version 2.1.1
+- remove communi subpackage - it is in separate package now
+
 * Fri Feb 01 2013 Parag Nemade <paragn AT fedoraproject DOT org> - 1.2.1-2
 - Rebuild for icu 50
 
diff --git a/sources b/sources
index 52492e3..ec5984c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d126aeb2da9931cf03201ebe0fa8e99d  v1.2.1.tar.gz
+27bf874fd7681d0aa00f7fd620fc8713  v2.1.1.tar.gz