From 12c670db5a22543e1018ca8534bda4eea3b9bc27 Mon Sep 17 00:00:00 2001
From: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>
Date: Aug 15 2012 14:59:14 +0000
Subject: Merge branch 'master' of ssh://pkgs.fedoraproject.org/libkolabxml


Conflicts:
	libkolabxml.spec

---

diff --git a/libkolabxml.spec b/libkolabxml.spec
index 718d86a..342d52d 100644
--- a/libkolabxml.spec
+++ b/libkolabxml.spec
@@ -50,6 +50,11 @@ Source0:        http://git.kolab.org/libkolabxml/snapshot/%{name}-%{version}.tar
 
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
+## upstreamable patches
+# not sure about this, the api conversion test uses seems *all* about boost_threads, but
+# then ends up with a symbol from boost_system -- rex
+Patch50:        libkolabxml-0.7.0-boost.patch 
+
 %if 0%{?rhel} < 6 && 0%{?fedora} < 15
 BuildRequires:  boost141-devel
 %else
@@ -185,6 +190,7 @@ bindings provided through libkolabxml.
 
 %prep
 %setup -q
+%patch1 -p1
 
 %build
 rm -rf build
@@ -303,9 +309,14 @@ rm -rf %{buildroot}
 %changelog
 * Wed Aug 15 2012 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 0.8.1-1
 - New upstream version 0.8.1
-
-* Fri Aug  3 2012 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 0.8.0-1
-- New upstream version 0.8.0
+- Revert s/qt-devel/qt4-devel/ - just require the latest qt-devel
+- Revert s/kdelibs-devel/kdelibs4-devel/ - also require the latest
+  kdelibs (frameworks FTW!)
+
+* Sun Aug 12 2012 Rex Dieter <rdieter@fedoraproject.org> - 0.7.0-3
+- drop BR: gcc-c++
+- s/qt-devel/qt4-devel/ s/kdelibs-devel/kdelibs4-devel/
+- fix build against boost-1.50
 
 * Wed Jul 25 2012 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 0.7.0-2
 - Fix build on ppc64