[swift] - update to new upstream version 1.0-beta9

[Jan Kaluža]

commit bf7cd25d0cae800870f6e9b0d8a35a67e3629d2b
Author: Jan Kaluza <hanzz.k at gmail.com>
Date:   Tue Mar 15 15:11:09 2011 +0100

    - update to new upstream version 1.0-beta9

 .gitignore        |    1 +
 sources           |    2 +-
 swift-build.patch |   29 +++++++++++++++++++++++++++++
 swift.spec        |   16 ++++++++++++----
 4 files changed, 43 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8e65e01..c4f7dde 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ swift-1.0beta5.tar.gz
 /swift-1.0beta6.tar.gz
 /swift-1.0beta7.tar.gz
 /swift-1.0beta8.tar.gz
+/swift-1.0beta9.tar.gz
diff --git a/sources b/sources
index 785e623..edaa2e7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d5597355effb42b0f47f7feb6f595ef6  swift-1.0beta8.tar.gz
+53d8d050fc7bbb8628a5e38f6bd03ccb  swift-1.0beta9.tar.gz
diff --git a/swift-build.patch b/swift-build.patch
new file mode 100644
index 0000000..022100c
--- /dev/null
+++ b/swift-build.patch
@@ -0,0 +1,29 @@
+diff --git a/BuildTools/SCons/SConstruct b/BuildTools/SCons/SConstruct
+index f1f437a..30dc9d7 100644
+--- a/BuildTools/SCons/SConstruct
++++ b/BuildTools/SCons/SConstruct
+@@ -505,6 +505,7 @@ conf.Finish()
+ 
+ # Lua
+ env["LUA_BUNDLED"] = 1
++env["LUA_FLAGS"] = {}
+ 
+ # Readline
+ conf = Configure(conf_env)
+diff --git a/Swift/Controllers/Chat/UserSearchController.cpp b/Swift/Controllers/Chat/UserSearchController.cpp
+index b3403d7..0d38d11 100644
+--- a/Swift/Controllers/Chat/UserSearchController.cpp
++++ b/Swift/Controllers/Chat/UserSearchController.cpp
+@@ -85,12 +85,10 @@ void UserSearchController::endDiscoWalker() {
+ 
+ 
+ void UserSearchController::handleDiscoServiceFound(const JID& jid, boost::shared_ptr<DiscoInfo> info) {
+-	bool isUserDirectory = false;
+ 	bool supports55 = false;
+ 	foreach (DiscoInfo::Identity identity, info->getIdentities()) {
+ 		if ((identity.getCategory() == "directory"
+ 			&& identity.getType() == "user")) {
+-			isUserDirectory = true;
+ 		}
+ 	}
+ 	std::vector<std::string> features = info->getFeatures();
diff --git a/swift.spec b/swift.spec
index 1e189c5..a6562e4 100644
--- a/swift.spec
+++ b/swift.spec
@@ -1,7 +1,7 @@
 Summary: XMPP client
 Name: swift
 Version: 1.0
-Release: 0.9.beta8%{?dist}
+Release: 0.10.beta9%{?dist}
 Group: Applications/Internet
 License: GPLv3
 # The source for this package was pulled from upstream's vcs.  Use the
@@ -10,8 +10,9 @@ License: GPLv3
 #  cd swift
 # git archive --format=tar --prefix=swift-1.0beta6/ swift-1.0beta6 \
 # | gzip > swift-1.0beta6.tar.gz
-Source0: %{name}-1.0beta8.tar.gz
+Source0: %{name}-1.0beta9.tar.gz
 Source1: %{name}.desktop
+Patch0: swift-build.patch
 URL: http://swift.im/
 BuildRequires: scons
 BuildRequires: qt-devel
@@ -32,7 +33,8 @@ Swift is an easy to setup and use Jabber/XMPP instant messaging chat
 application.
 
 %prep
-%setup -q -n %{name}-1.0beta8
+%setup -q -n %{name}-1.0beta9
+%patch0 -p1
 
 # Remove 3rd party libraries.
 find 3rdParty/Boost -delete
@@ -40,10 +42,13 @@ find 3rdParty/SCons -delete
 find 3rdParty/Expat -delete
 find 3rdParty/LibIDN -delete
 find 3rdParty/SQLite -delete
+find 3rdParty/Lua -delete
 find 3rdParty/ZLib -delete
 find 3rdParty/CAres -delete
 find 3rdParty/CppUnit -delete
 find 3rdParty/LCov -delete
+find 3rdParty/OpenSSL -delete
+find 3rdParty/Snarl -delete
 rm 3rdParty/hippomocks.h
 # Swift fails to build with our docbook, but it's used only to generate
 # documentation at compile time, so it's not problem.
@@ -55,7 +60,7 @@ echo 'linkflags="-lpthread -lX11 -lQtDBus"' >> config.py
 echo 'ccflags="%{optflags} -DBOOST_FILESYSTEM_VERSION=2".split(" ")' >> config.py
 
 %build
-scons V=1
+scons V=1 Swift
 
 %install
 install -p -D -m 755 Swift/QtUI/swift \
@@ -76,6 +81,9 @@ desktop-file-install \
 %{_datadir}/pixmaps/%{name}.xpm
 
 %changelog
+* Tue Mar 15 2011 Jan Kaluza <jkaluza at redhat.com> - 1.0-0.10.beta9
+- update to new upstream version 1.0-beta9
+
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-0.9.beta8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild