[libkolab: 1/2] Check in new sources, correct subtle packaging errors and generate additional bindings

[Jeroen van Meeuwen]

commit a56aec4e1d1eb34203ea3261aeacb1a7614274c1
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Sun Jul 29 18:06:16 2012 +0200

    Check in new sources, correct subtle packaging errors and generate additional bindings

 libkolab.spec |   86 +++++++++++++++++++++++++++++++++++++++++++++++++++++---
 sources       |    2 +-
 2 files changed, 82 insertions(+), 6 deletions(-)
---
diff --git a/libkolab.spec b/libkolab.spec
index 6c149ec..5f8618c 100644
--- a/libkolab.spec
+++ b/libkolab.spec
@@ -1,6 +1,6 @@
 Name:           libkolab
 Version:        0.3
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Kolab Object Handling Library
 
 License:        LGPLv3+
@@ -9,8 +9,18 @@ URL:            http://git.kolab.org/libkolab
 # From http://git.kolab.org/libkolab/snapshot/54d11d067951ddedd8b28aa7eb54e4f68bc81218.tar.gz
 Source0:        http://git.kolab.org/%{name}/snapshot/%{name}-%{version}.tar.gz
 
+%if 0%{?rhel} > 6 || 0%{?fedora} > 16
 BuildRequires:  kdepimlibs-devel >= 4.8
-BuildRequires:  libkolabxml-devel >= 0.6
+%else
+# Note: available within kolabsys.com infrastructure only, as being (essentially) a
+# fork of various kde 4.9 libraries that depend on kde*, and that have no place in el6.
+BuildRequires:  libcalendaring-devel
+%endif
+BuildRequires:  libcurl-devel
+BuildRequires:  libkolabxml-devel >= 0.7
+BuildRequires:  php-devel
+BuildRequires:  python-devel
+BuildRequires:  qt-devel
 
 %description
 The libkolab library is an advanced library to  handle Kolab objects.
@@ -18,13 +28,43 @@ The libkolab library is an advanced library to  handle Kolab objects.
 %package devel
 Summary:        Kolab library development headers
 Requires:       %{name}%{?_isa} = %{version}-%{release}
-Requires:       kdepimlibs-devel >= 4.8
-Requires:       libkolabxml-devel >= 0.6
+%if 0%{?rhel} > 6 || 0%{?fedora} > 16
+BuildRequires:  kdepimlibs-devel >= 4.8
+%else
+# Note: available within kolabsys.com infrastructure only, as being (essentially) a
+# fork of various kde 4.9 libraries that depend on kde*, and that have no place in el6.
+BuildRequires:  libcalendaring-devel
+%endif
+Requires:       libkolabxml-devel >= 0.7
+Requires:       php-devel
 Requires:       pkgconfig
+Requires:       python-devel
 
 %description devel
 Development headers for the Kolab object libraries.
 
+%package -n php-kolab
+Summary:        PHP Bindings for libkolab
+Group:          System Environment/Libraries
+Requires:       %{name}%{?_isa} = %{version}-%{release}
+%if 0%{?rhel} > 5 || 0%{?fedora} > 15
+Requires:       php(zend-abi) = %{php_zend_api}
+Requires:       php(api) = %{php_core_api}
+%else
+Requires:       php-api = %{php_apiver}
+%endif
+
+%description -n php-kolab
+PHP Bindings for libkolab
+
+%package -n python-kolab
+Summary:        Python bindings for libkolab
+Group:          System Environment/Libraries
+Requires:       %{name}%{?_isa} = %{version}-%{release}
+
+%description -n python-kolab
+Python bindings for libkolab
+
 %prep
 %setup -q
 
@@ -33,7 +73,14 @@ rm -rf build
 mkdir -p build
 pushd build
 %{cmake} -Wno-fatal-errors -Wno-errors \
-    -DINCLUDE_INSTALL_DIR=%{_includedir}/kolab \
+    -DINCLUDE_INSTALL_DIR=%{_includedir} \
+%if 0%{?rhel} < 7 && 0%{?fedora} < 17
+    -DUSE_LIBCALENDARING=ON \
+%endif
+    -DPHP_BINDINGS=ON \
+    -DPHP_INSTALL_DIR=%{php_extdir} \
+    -DPYTHON_BINDINGS=ON \
+    -DPYTHON_INSTALL_DIR=%{python_sitearch} \
     ..
 make
 popd
@@ -44,6 +91,17 @@ pushd build
 make install DESTDIR=%{buildroot}
 popd
 
+%check
+pushd build/tests
+./benchmarktest || :
+./calendaringtest || :
+./formattest || :
+./freebusytest || :
+./icalendartest || :
+./kcalconversiontest || :
+./upgradetest || :
+popd
+
 %clean
 rm -rf %{buildroot}
 
@@ -60,7 +118,25 @@ rm -rf %{buildroot}
 %{_libdir}/cmake/Libkolab
 %{_includedir}/kolab
 
+%files -n php-kolab
+%{php_extdir}/calendaring.php
+%{php_extdir}/calendaring.so
+%{php_extdir}/icalendar.php
+%{php_extdir}/icalendar.so
+
+%files -n python-kolab
+%{python_sitearch}/_calendaring.so
+%{python_sitearch}/calendaring.py*
+%{python_sitearch}/_icalendar.so
+%{python_sitearch}/icalendar.py*
+
 %changelog
+* Sat Jul 28 2012 Jeroen van Meeuwen <vanmeeuwen at kolabsys.com> - 0.3-6
+- Ship PHP and Python bindings
+- Conditionally build with libcalendaring
+- Execute tests
+- Correct installation directory for headers
+
 * Tue Jun 26 2012 Jeroen van Meeuwen <vanmeeuwen at kolabsys.com> - 0.3-5
 - Fix some review issues (#833853)
 - Rebuild after some packaging fixes (4)
diff --git a/sources b/sources
index d5702d2..af28b06 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-adda2e7cc02181fb42afcb03e62f9f38  libkolab-0.3.tar.gz
+9e3ef5203b8155493c91c566bd4114e6  libkolab-0.3.tar.gz