- rel 1; pldized

diff --git a/0001-Fix-kolab-errorhandler.h-kolabformat-errorhandler.h.patch b/0001-Fix-kolab-errorhandler.h-kolabformat-errorhandler.h.patch
new file mode 100644 (file)
index 0000000..4edb9da
--- /dev/null
+++ b/0001-Fix-kolab-errorhandler.h-kolabformat-errorhandler.h.patch
@@ -0,0 +1,39 @@
+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 c670aa0eac14eded90e93e71efb77b9b892b2161..5636018facd372e9c5545e5ccacf20b80195a88f 100644 (file)
--- a/libkolab.spec
+++ b/libkolab.spec
@@ -1,27 +1,24 @@
-# TODO
-# - pldize this package!
-#  - file attrs
-#  - pld cmake macros
-#  - tests to build, not %check and add bcond
-#  - drop rhel/fedora dist macros
+%bcond_without tests
 Summary:       Kolab Object Handling Library
 Name:          libkolab
 Version:       0.3.1
-Release:       0.1
+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
+BuildRequires: QtCore-devel
 BuildRequires: curl-devel
 BuildRequires: kde4-kdepimlibs-devel >= 4.8
-BuildRequires: libcalendaring-devel
-BuildRequires: libcalendaring-devel
-BuildRequires: libkolabxml-devel >= 0.7
+BuildRequires: libkolabxml-devel >= 0.8
 BuildRequires: php-devel >= 4:5.0.4
 BuildRequires: python-devel
-BuildRequires: qt-devel
+BuildRequires: qt4-build
 BuildRequires: rpmbuild(macros) >= 1.519
+BuildRequires: swig
+BuildRequires: swig-php
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -31,7 +28,7 @@ The libkolab library is an advanced library to handle Kolab objects.
 Summary:       Kolab library development headers
 Group:         Development/Libraries
 Requires:      %{name} = %{version}-%{release}
-Requires:      libkolabxml-devel >= 0.7
+Requires:      libkolabxml-devel >= 0.8
 Requires:      php-devel
 Requires:      pkgconfig
 Requires:      python-devel
@@ -58,6 +55,7 @@ Python bindings for libkolab.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 rm -rf build
@@ -66,9 +64,6 @@ cd build
 %cmake \
        -Wno-fatal-errors -Wno-errors \
        -DINCLUDE_INSTALL_DIR=%{_includedir} \
-%if 0%{?rhel} < 7 && 0%{?fedora} < 17
-       -DUSE_LIBCALENDARING=ON \
-%endif
        -DPHP_BINDINGS=ON \
        -DPHP_INSTALL_DIR=%{php_extensiondir} \
        -DPYTHON_BINDINGS=ON \
@@ -77,16 +72,8 @@ cd build
 %{__make}
 cd -
 
-%install
-rm -rf $RPM_BUILD_ROOT
-%{__make} -C build install \
-       DESTDIR=$RPM_BUILD_ROOT
-
-install -d $RPM_BUILD_ROOT%{php_data_dir}
-mv $RPM_BUILD_ROOT{%{php_extensiondir}/*.php,%{php_data_dir}}
-
-%check
-pushd build/tests
+%if %{with tests}
+cd build/tests
 ./benchmarktest || :
 ./calendaringtest || :
 ./formattest || :
@@ -94,7 +81,16 @@ pushd build/tests
 ./icalendartest || :
 ./kcalconversiontest || :
 ./upgradetest || :
-popd
+%endif
+
+%install
+rm -rf $RPM_BUILD_ROOT
+
+%{__make} -C build install \
+       DESTDIR=$RPM_BUILD_ROOT
+
+install -d $RPM_BUILD_ROOT%{php_data_dir}
+mv $RPM_BUILD_ROOT{%{php_extensiondir}/*.php,%{php_data_dir}}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -104,25 +100,30 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%{_libdir}/%{name}.so.0
-%{_libdir}/%{name}.so.0.3
+%attr(755,root,root) %ghost %{_libdir}/%{name}.so.0
+%attr(755,root,root) %{_libdir}/%{name}.so.*.*
 
 %files devel
 %defattr(644,root,root,755)
-%{_libdir}/%{name}.so
+%attr(755,root,root) %{_libdir}/%{name}.so
 %{_libdir}/cmake/Libkolab
 %{_includedir}/kolab
 
 %files -n php-kolab
 %defattr(644,root,root,755)
-%{php_data_dir}/calendaring.php
-%{php_data_dir}/icalendar.php
-%attr(755,root,root) %{php_extensiondir}/calendaring.so
-%attr(755,root,root) %{php_extensiondir}/icalendar.so
+%{php_data_dir}/kolabcalendaring.php
+%{php_data_dir}/kolabicalendar.php
+%{php_data_dir}/kolabshared.php
+%attr(755,root,root) %{php_extensiondir}/kolabcalendaring.so
+%attr(755,root,root) %{php_extensiondir}/kolabicalendar.so
+%attr(755,root,root) %{php_extensiondir}/kolabshared.so
 
 %files -n python-kolab
 %defattr(644,root,root,755)
-%{py_sitedir}/_calendaring.so
-%{py_sitedir}/calendaring.py[co]
-%{py_sitedir}/_icalendar.so
-%{py_sitedir}/icalendar.py[co]
+%dir %{py_sitedir}/kolab
+%attr(755,root,root) %{py_sitedir}/kolab/_calendaring.so
+%{py_sitedir}/kolab/calendaring.py*
+%attr(755,root,root) %{py_sitedir}/kolab/_icalendar.so
+%{py_sitedir}/kolab/icalendar.py*
+%attr(755,root,root) %{py_sitedir}/kolab/_shared.so
+%{py_sitedir}/kolab/shared.py*