- up to 0.5.0

diff --git a/0001-Fix-kolab-errorhandler.h-kolabformat-errorhandler.h.patch b/0001-Fix-kolab-errorhandler.h-kolabformat-errorhandler.h.patch
deleted file mode 100644 (file)
index 4edb9da..0000000
--- a/0001-Fix-kolab-errorhandler.h-kolabformat-errorhandler.h.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 8886295189491151dbd3590649aaf43e15321dc6 Mon Sep 17 00:00:00 2001
-From: "Jeroen van Meeuwen (Kolab Systems)" <vanmeeuwen@kolabsys.com>
-Date: Wed, 15 Aug 2012 17:20:12 +0100
-Subject: [PATCH] Fix kolab/errorhandler.h > kolabformat/errorhandler.h
-
----
- tests/kolabobjecttest.cpp | 2 +-
- tests/upgradetest.cpp     | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/tests/kolabobjecttest.cpp b/tests/kolabobjecttest.cpp
-index 19d7de7..9f44f2a 100644
---- a/tests/kolabobjecttest.cpp
-+++ b/tests/kolabobjecttest.cpp
-@@ -21,7 +21,7 @@
- 
- #include "kolabformat/kolabobject.h"
- #include <kdebug.h>
--#include <kolab/errorhandler.h>
-+#include <kolabformat/errorhandler.h>
- 
- void KolabObjectTest::preserveLatin1()
- {
-diff --git a/tests/upgradetest.cpp b/tests/upgradetest.cpp
-index ee376be..0e943ac 100644
---- a/tests/upgradetest.cpp
-+++ b/tests/upgradetest.cpp
-@@ -21,7 +21,7 @@
- #include <QTest>
- #include <kolabcontainers.h>
- #include <kolabformat.h>
--#include <kolab/errorhandler.h>
-+#include <kolabformat/errorhandler.h>
- 
- #include "testutils.h"
- #include "kolabformat/kolabobject.h"
--- 
-1.7.11.2
-

diff --git a/libkolab.spec b/libkolab.spec
index 3c9a8832fb7a981b04b2548623684da06dbd4fd1..1235eeeed6697cff09b5e48129b716ffa6c7b312 100644 (file)
--- a/libkolab.spec
+++ b/libkolab.spec
@@ -4,24 +4,24 @@
 
 Summary:       Kolab Object Handling Library
 Name:          libkolab
-Version:       0.3.1
+Version:       0.5.0
 Release:       1
 License:       LGPL v3+
 Group:         Libraries
 URL:           http://git.kolab.org/libkolab
 Source0:       http://mirror.kolabsys.com/pub/releases/%{name}-%{version}.tar.gz
-# Source0-md5: 99f2b2c519c3ebaa57f8f520e8880e9a
-Patch0:                0001-Fix-kolab-errorhandler.h-kolabformat-errorhandler.h.patch
+# Source0-md5: 38da4b0918e8585ab935ae02bc321aa0
 BuildRequires: QtCore-devel
 BuildRequires: curl-devel
 BuildRequires: kde4-kdepimlibs-devel >= 4.8
-BuildRequires: libkolabxml-devel >= 0.8
+BuildRequires: libkolabxml-devel >= 1.0
 BuildRequires: php-devel >= 4:5.0.4
 BuildRequires: python-devel
 BuildRequires: qt4-build
 BuildRequires: rpmbuild(macros) >= 1.600
 BuildRequires: swig
 BuildRequires: swig-php
+BuildRequires: swig-python
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -31,7 +31,7 @@ The libkolab library is an advanced library to handle Kolab objects.
 Summary:       Kolab library development headers
 Group:         Development/Languages/PHP
 Requires:      %{name} = %{version}-%{release}
-Requires:      libkolabxml-devel >= 0.8
+Requires:      libkolabxml-devel >= 1.0
 Requires:      php-devel
 Requires:      pkgconfig
 Requires:      python-devel
@@ -58,7 +58,6 @@ Python bindings for libkolab.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 rm -rf build
@@ -66,6 +65,7 @@ install -d build
 cd build
 %cmake \
        -Wno-fatal-errors -Wno-errors \
+       -DPHP_EXECUTABLE=%{_bindir}/php \
        -DINCLUDE_INSTALL_DIR=%{_includedir} \
        -DPHP_BINDINGS=ON \
        -DPHP_INSTALL_DIR=%{php_extensiondir} \