[libkolab] Check in new version of libkolab

[Jeroen van Meeuwen]

commit 603bf4881e1dff2e696b0626a09ae7481dc9b220
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Tue Nov 20 16:04:46 2012 +0000

    Check in new version of libkolab

 .gitignore    |    1 +
 libkolab.spec |   20 +++++++++++++-------
 sources       |    2 +-
 3 files changed, 15 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2905849..c66acbb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /libkolab-0.3.tar.gz
 /libkolab-0.3.0.tar.gz
 /libkolab-0.3.1.tar.gz
+/libkolab-0.4.tar.gz
diff --git a/libkolab.spec b/libkolab.spec
index 88f6d2b..698e316 100644
--- a/libkolab.spec
+++ b/libkolab.spec
@@ -9,17 +9,16 @@
 }
 
 Name:           libkolab
-Version:        0.3.1
-Release:        3%{?dist}
+Version:        0.4
+Release:        0.20121120.1.gitf60ac8df%{?dist}
 Summary:        Kolab Object Handling Library
 
 License:        LGPLv3+
 URL:            http://git.kolab.org/libkolab
 
+# From http://git.kolab.org/%{name}/snapshot/f60ac8df94c5412c26ee89c6dda3f3f32e22b275.tar.gz
 Source0:        http://git.kolab.org/%{name}/snapshot/%{name}-%{version}.tar.gz
 
-Patch1:         0001-Fix-kolab-errorhandler.h-kolabformat-errorhandler.h.patch
-
 %if 0%{?rhel} > 6 || 0%{?fedora} > 16
 BuildRequires:  kdepimlibs-devel >= 4.9
 %else
@@ -78,7 +77,6 @@ Python bindings for libkolab
 
 %prep
 %setup -q
-%patch1 -p1
 
 %build
 rm -rf build
@@ -108,9 +106,11 @@ mv %{buildroot}/%{php_extdir}/*.php %{buildroot}/%{_datadir}/php/.
 
 mkdir -p %{buildroot}/%{php_inidir}
 cat >%{buildroot}/%{php_inidir}/kolab.ini <<EOF
-extension=kolabcalendaring.so
-extension=kolabicalendar.so
+; Kolab libraries
+extension=kolabformat.so
 extension=kolabshared.so
+extension=kolabobject.so
+extension=kolabcalendaring.so
 EOF
 
 %check
@@ -146,6 +146,8 @@ rm -rf %{buildroot}
 %{php_extdir}/kolabcalendaring.so
 %{_datadir}/php/kolabicalendar.php
 %{php_extdir}/kolabicalendar.so
+%{_datadir}/php/kolabobject.php
+%{php_extdir}/kolabobject.so
 %{_datadir}/php/kolabshared.php
 %{php_extdir}/kolabshared.so
 
@@ -158,6 +160,10 @@ rm -rf %{buildroot}
 %{python_sitearch}/kolab/shared.py*
 
 %changelog
+* Tue Nov 20 2012 Jeroen van Meeuwen <vanmeeuwen at kolabsys.com> - 0.4-0.1
+- New upstream release
+- Correct php.d/kolab.ini
+
 * Wed Aug 15 2012 Jeroen van Meeuwen <vanmeeuwen at kolabsys.com> - 0.3.1-3
 - Fix build (patch1)
 - Merge back with Fedora,
diff --git a/sources b/sources
index 6b88c3e..9637a56 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-99f2b2c519c3ebaa57f8f520e8880e9a  libkolab-0.3.1.tar.gz
+416fb4b9458a3838742d1bd019b3179f  libkolab-0.4.tar.gz