[swift] fix building with new boost filesystem

Jan Kaluža jkaluza at fedoraproject.org
Fri Aug 17 06:51:18 UTC 2012


commit 2a99a1a5606cf671313796a997283d1a25a64e9b
Author: Jan Kaluza <hanzz.k at gmail.com>
Date:   Fri Aug 17 08:49:14 2012 +0200

    fix building with new boost filesystem

 swift.spec |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)
---
diff --git a/swift.spec b/swift.spec
index 10f371a..85ca623 100644
--- a/swift.spec
+++ b/swift.spec
@@ -3,7 +3,7 @@
 Summary: XMPP client
 Name: swift
 Version: 2.0
-Release: 0.1.beta1%{?dist}
+Release: 0.2.beta1%{?dist}
 Group: Applications/Internet
 License: GPLv3
 Source0: http://swift.im/downloads/releases/%{upstream_version}/%{upstream_version}.tar.gz
@@ -13,6 +13,7 @@ Patch1: swiften-libdirsuffix.patch
 Patch2: swift-no-cache-jid-prep.patch 
 Patch3: swiften-socks5.patch
 Patch4: swift-timeutc.patch
+Patch5: swift-boost-filesystem.patch
 URL: http://swift.im/
 BuildRequires: scons
 BuildRequires: qt-devel
@@ -61,6 +62,7 @@ and performant C++ library for implementing XMPP applications.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 # Remove 3rd party libraries.
 find 3rdParty/Boost -delete
@@ -84,7 +86,7 @@ rm 3rdParty/hippomocks.h
 echo 'qt="/usr"' > config.py
 # echo 'linkflags="-lpthread -lX11 -lQtDBus"' >> config.py
 # ccflags have to be a list, not string
-echo 'ccflags="%{optflags} -DBOOST_FILESYSTEM_VERSION=2".split(" ")' >> config.py
+echo 'ccflags="%{optflags} -DBOOST_FILESYSTEM_VERSION=3".split(" ")' >> config.py
 
 %build
 # rpmlint warns about buildroot here, but it's needed to put proper paths in the "swiften-config" binary.
@@ -124,6 +126,9 @@ desktop-file-install \
 %{_libdir}/libSwiften.so
 
 %changelog
+* Fri Aug 17 2012 Jan Kaluza <jkaluza at redhat.com> - 2.0-0.2.beta1
+- fix building with new boost filesystem
+
 * Thu Aug 01 2012 Jan Kaluza <jkaluza at redhat.com> - 2.0-0.1.beta1
 - Update to new upstream version
 - Added swiften library


More information about the scm-commits mailing list