- updated to 0.6.0

- added patch taken from Debian sid

diff --git a/0002-Make-libkolab-compile-with-upstream-kdepimlibs.patch b/0002-Make-libkolab-compile-with-upstream-kdepimlibs.patch
new file mode 100644 (file)
index 0000000..c0696b6
--- /dev/null
+++ b/0002-Make-libkolab-compile-with-upstream-kdepimlibs.patch
@@ -0,0 +1,51 @@
+From 34edc0a846b87570c06a5942b458adb720a34a9b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Sandro=20Knau=C3=9F?= <mail@sandroknauss.de>
+Date: Tue, 10 Feb 2015 10:59:18 +0100
+Subject: [PATCH] Make libkolab compile with upstream kdepimlibs
+
+Because GENERIC tags have not entered upstream, we have to test for
+support. Our integration branch not supports a feature flag to indicate
+the availability of that feature.
+
+KOLAB: #4448
+---
+ CMakeLists.txt              | 5 +++++
+ kolabformat/kolabobject.cpp | 5 ++++-
+ 2 files changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 365edac..bd53e27 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -78,6 +78,11 @@ add_definitions( -DKDEPIMLIBS_VERSION_MAJOR=${KdepimLibs_VERSION_MAJOR} )
+ add_definitions( -DKDEPIMLIBS_VERSION_MINOR=${KdepimLibs_VERSION_MINOR} )
+ add_definitions( -DKDEPIMLIBS_VERSION_PATCH=${KdepimLibs_VERSION_PATCH} )
+ 
++#Tag::GENERIC is only available at the moment at the kolab/integration branches
++if (KDEPIMLIBS_HAS_GENERIC_TAG)
++    add_definitions( -DKDEPIMLIBS_HAS_GENERIC_TAG)
++endif()
++
+ if("${KdepimLibs_VERSION}" VERSION_GREATER "4.8.40" OR USE_LIBCALENDARING)
+     add_definitions(-DKDEPIMLIBS_VERSION_DEVEL)
+ endif()
+diff --git a/kolabformat/kolabobject.cpp b/kolabformat/kolabobject.cpp
+index 681b4a5..e5c404d 100644
+--- a/kolabformat/kolabobject.cpp
++++ b/kolabformat/kolabobject.cpp
+@@ -435,8 +435,11 @@ ObjectType KolabObjectReader::Private::readKolabV3(const KMime::Message::Ptr &ms
+                 mTag = Akonadi::Tag();
+                 mTag.setName(Conversion::fromStdString(relation.name()));
+                 mTag.setGid(Conversion::fromStdString(configuration.uid()).toLatin1());
++#ifdef KDEPIMLIBS_HAS_GENERIC_TAG
+                 mTag.setType(Akonadi::Tag::GENERIC);
+-
++#else
++                mTag.setType(Akonadi::Tag::PLAIN);
++#endif
+                 mTagMembers.reserve(relation.members().size());
+                 foreach (const std::string &member, relation.members()) {
+                     mTagMembers << Conversion::fromStdString(member);
+-- 
+2.1.4
+

diff --git a/libkolab.spec b/libkolab.spec
index 894e63df2c6683398da534a64aeefffbaf53f6af..b4129b3056e2526474b4bc46472bfcf72781a376 100644 (file)
--- a/libkolab.spec
+++ b/libkolab.spec
@@ -7,23 +7,27 @@
 %define                php_name        php55
 Summary:       Kolab Object Handling Library
 Name:          libkolab
-Version:       0.5.2
-Release:       3
+Version:       0.6.0
+Release:       1
 License:       LGPL v3+
 Group:         Libraries
 Source0:       http://mirror.kolabsys.com/pub/releases/%{name}-%{version}.tar.gz
-# Source0-md5: f33fcdc6852b9d045cb2be98ef3907ed
+# Source0-md5: 3c4fc1fec2dfcc0841f29de8f6ff0cd3
+Patch0:                0002-Make-libkolab-compile-with-upstream-kdepimlibs.patch
 URL:           http://git.kolab.org/libkolab
 BuildRequires: QtCore-devel
 BuildRequires: curl-devel
 BuildRequires: kde4-kdepimlibs-devel >= 4.8
-BuildRequires: libkolabxml-devel >= 1.0
+BuildRequires: libkolabxml-devel >= 1.1
 BuildRequires: qt4-build
 BuildRequires: rpmbuild(macros) >= 1.600
 BuildRequires: swig
 %if %{with php}
 BuildRequires: %{php_name}-devel
 BuildRequires: %{php_name}-cli
+%if %{with tests}
+BuildRequires: %{php_name}-pcre
+%endif
 BuildRequires: %{php_name}-program
 BuildRequires: swig-php
 %endif
@@ -64,6 +68,7 @@ Python bindings for libkolab.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 install -d build