[swift] update to new upstream version 2.0

[Jan Kaluža]

commit 49792b709facbaeac24d33aee4e6d7f347da99ec
Author: Jan Kaluza <hanzz.k at gmail.com>
Date:   Thu Jan 3 08:43:10 2013 +0100

    update to new upstream version 2.0

 sources                      |    2 +-
 swift-boost-filesystem.patch |   13 -------------
 swift-timeutc.patch          |   13 -------------
 swift.desktop                |   13 -------------
 swift.spec                   |   40 ++++++++++++++++++++++------------------
 5 files changed, 23 insertions(+), 58 deletions(-)
---
diff --git a/sources b/sources
index f2420c8..f705ba9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6c328a66ccfed3e6b91f35dd4f5029b4  swift-2.0beta2.tar.gz
+f8a266441c44d1ff46acf7aa647ba189  swift-2.0.tar.gz
diff --git a/swift.spec b/swift.spec
index 80b1cac..6f96c4e 100644
--- a/swift.spec
+++ b/swift.spec
@@ -1,18 +1,13 @@
-%define upstream_version swift-2.0beta2
-
 Summary: XMPP client
 Name: swift
 Version: 2.0
-Release: 0.3.beta2%{?dist}
+Release: 1%{?dist}
 Group: Applications/Internet
 License: GPLv3
-Source0: http://swift.im/downloads/releases/%{upstream_version}/%{upstream_version}.tar.gz
-Source1: %{name}.desktop
+Source0: http://swift.im/downloads/releases/swift-%{version}/swift-%{version}.tar.gz
 Patch0: swift-build.patch
 Patch1: swiften-libdirsuffix.patch
 Patch2: swift-no-cache-jid-prep.patch 
-Patch4: swift-timeutc.patch
-Patch5: swift-boost-filesystem.patch
 URL: http://swift.im/
 BuildRequires: scons
 BuildRequires: qt-devel
@@ -55,19 +50,24 @@ Swiften is a robust, high-quality, standards-compliant, cross-platform,
 and performant C++ library for implementing XMPP applications.
 
 %prep
-%setup -q -n %{upstream_version}
+%setup -q
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-# Only for Fedora > 17, because Fedora <= 17 has good glibc/boost combination
-# and this bug is not there.
-%if 0%{fedora} > 17
-%patch4 -p1
-%endif
-%patch5 -p1
 
 # Remove 3rd party libraries.
+%if 0%{?rhel} > 0 && 0%{?rhel} <= 6
+# On EPEL6, boost/uuid/*.h are not included in system. I had discussion
+# with boost maintainer and he does not want to add uuid there.
+# It is not problem, because uuid is only header used during compilation
+# and does not interfere with other system files.
+find 3rdParty/Boost/src/boost/*|grep -v 'boost/uuid'|xargs rm -rf
+find 3rdParty/Boost/src/libs -delete
+find 3rdParty/Boost/src/tools -delete
+%else
 find 3rdParty/Boost/src -delete
+%endif
+
 find 3rdParty/SCons -delete
 find 3rdParty/Expat/src -delete
 find 3rdParty/LibIDN -delete
@@ -98,11 +98,12 @@ echo 'qt="/usr"' > config.py
 echo 'ccflags="%{optflags}".split(" ")' >> config.py
 
 %build
+%if 0%{?rhel} > 0 && 0%{?rhel} <= 6
+scons V=1 3rdParty/Boost/uuid
+%endif
+
 # rpmlint warns about buildroot here, but it's needed to put proper paths in the "swiften-config" binary.
 scons V=1 Swift Swiften swiften_dll=1 SWIFTEN_INSTALLDIR=%{buildroot}/usr SWIFTEN_LIBDIR=%{buildroot}/%{_libdir} %{?_smp_mflags}
-#cat config.log
-# ls -l /usr/include/boost
-# exit 1
 
 %install
 scons V=1 swiften_dll=1 SWIFTEN_INSTALLDIR=%{buildroot}/usr SWIFTEN_LIBDIR=%{buildroot}/%{_libdir} %{buildroot}/usr
@@ -114,7 +115,7 @@ install -p -m 644 -D Swift/resources/logo/logo-icon-32.xpm \
 # menu
 desktop-file-install \
 --dir=%{buildroot}%{_datadir}/applications \
-%{SOURCE1}
+Swift/resources/swift.desktop
 
 %check
 LD_LIBRARY_PATH=./Swiften scons V=1 %{?_smp_mflags} test=unit QA
@@ -141,6 +142,9 @@ LD_LIBRARY_PATH=./Swiften scons V=1 %{?_smp_mflags} test=unit QA
 %{_libdir}/libSwiften.so
 
 %changelog
+* Thu Jan 03 2013 Jan Kaluza <jkaluza at redhat.com> - 2.0-1
+- update to new upstream version 2.0
+
 * Tue Oct 09 2012 Jan Kaluza <jkaluza at redhat.com> - 2.0-0.3.beta2
 - update to new upstream version 2.0-beta2
 - fix #857900 - swift binary renamed to swift-im