Kolab Groupware OBS

_service:set_version:libkolab.spec Deleted

@@ -1,303 +0,0 @@
-# Needed for opensuse build system
-%if 0%{?opensuse_bs}
-#!BuildIgnore:  fedora-logos-httpd
-#!BuildIgnore:  httpd
-%endif
-
-%if 0%{?suse_version}
-%global php php5
-%{!?php_inidir: %global php_inidir %{_sysconfdir}/php5/conf.d/}
-%{!?php_extdir: %global php_extdir %{_libdir}/php5/extensions}
-%else
-%global php php
-%{!?php_inidir: %global php_inidir %{_sysconfdir}/php.d/}
-%{!?php_extdir: %global php_extdir %{_libdir}/php/modules}
-%endif
-%{!?php_apiver: %global php_apiver  %((echo 0; php -i 2>/dev/null | sed -n 's/^PHP API => //p') | tail -1)}
-
-# Filter out private python and php libs. Does not work on EPEL5,
-# therefor we use it conditionally
-%{?filter_setup:
-%filter_provides_in %{python_sitearch}/.*\.so$
-%filter_provides_in %{php_extdir}/.*\.so$
-%filter_setup
-}
-
-%if 0%{?suse_version}
-Name:           libkolab0
-%else
-Name:           libkolab
-%endif
-
-Version:        0.6.git.1424370877
-Release:        0%{?dist}
-Summary:        Kolab Object Handling Library
-
-License:        LGPLv3+
-URL:            http://git.kolab.org/libkolab
-
-# From 2881447555eb7965f557158c88ae2aa18e936971
-Source0:        http://git.kolab.org/%{name}/snapshot/libkolab-%{version}.tar.gz
-
-BuildRequires:  cmake
-%if 0%{?rhel} > 6 || 0%{?fedora} > 16
-BuildRequires:  kdepimlibs-devel >= 4.9
-%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 >= 4.9
-%endif
-BuildRequires:  libcurl-devel
-BuildRequires:  libkolabxml-devel >= 1.0
-BuildRequires:  php >= 5.3
-BuildRequires:  php-devel >= 5.3
-BuildRequires:  python-devel
-%if 0%{?suse_version}
-BuildRequires:  qt-devel
-%else
-BuildRequires:  qt4-devel
-%endif
-Provides:       libkolab%{?_isa} = %{version}
-
-%description
-The libkolab library is an advanced library to  handle Kolab objects.
-
-%if 0%{?suse_version}
-%package -n libkolab-devel
-%else
-%package devel
-%endif
-Summary:        Kolab library development headers
-Requires:       libkolab%{?_isa} = %{version}
-%if 0%{?rhel} > 6 || 0%{?fedora} > 16
-BuildRequires:  kdepimlibs-devel >= 4.9
-%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 >= 4.9
-%endif
-Requires:       libkolabxml-devel >= 1.0
-Requires:       php-devel
-Requires:       pkgconfig
-Requires:       python-devel
-
-%if 0%{?suse_version}
-%description -n libkolab-devel
-%else
-%description devel
-%endif
-Development headers for the Kolab object libraries.
-
-%package -n php-kolab
-Summary:        PHP Bindings for libkolab
-Group:          System Environment/Libraries
-Requires:       libkolab%{?_isa} = %{version}
-%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
-%if 0%{?suse_version}
-Obsoletes:      php-%{name} < %{version}
-Provides:       php-%{name} = %{version}
-%endif
-
-%description -n php-kolab
-PHP Bindings for libkolab
-
-%package -n python-kolab
-Summary:        Python bindings for libkolab
-Group:          System Environment/Libraries
-Requires:       libkolab%{?_isa} = %{version}
-Requires:       python-kolabformat >= 1.0.0
-%if 0%{?suse_version}
-Obsoletes:      python-%{name} < %{version}
-Provides:       python-%{name} = %{version}
-%endif
-
-%description -n python-kolab
-Python bindings for libkolab
-
-%prep
-%setup -q -n libkolab-%{version}
-
-%build
-rm -rf build
-mkdir -p build
-pushd build
-%if 0%{?suse_version}
-CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ;
-CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ;
-FFLAGS="${FFLAGS:-%optflags%{?_fmoddir: -I%_fmoddir}}" ; export FFLAGS ;
-FCFLAGS="${FCFLAGS:-%optflags%{?_fmoddir: -I%_fmoddir}}" ; export FCFLAGS ;
-%{?__global_ldflags:LDFLAGS="${LDFLAGS:-%__global_ldflags}" ; export LDFLAGS ;}
-cmake \
-    -DCMAKE_C_FLAGS_RELEASE:STRING="-DNDEBUG" \
-    -DCMAKE_CXX_FLAGS_RELEASE:STRING="-DNDEBUG" \
-    -DCMAKE_Fortran_FLAGS_RELEASE:STRING="-DNDEBUG" \
-    -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \
-    -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \
-    -DINCLUDE_INSTALL_DIR:PATH=%{_includedir} \
-    -DLIB_INSTALL_DIR:PATH=%{_libdir} \
-    -DSYSCONF_INSTALL_DIR:PATH=%{_sysconfdir} \
-    -DSHARE_INSTALL_PREFIX:PATH=%{_datadir} \
-%if "%{?_lib}" == "lib64"
-    %{?_cmake_lib_suffix64} \
-%endif
-    -DBUILD_SHARED_LIBS:BOOL=ON \
-%else
-%cmake \
-%endif
-    -DBoost_NO_BOOST_CMAKE=TRUE \
-    -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_extdir} \
-    -DPYTHON_BINDINGS=ON \
-    -DPYTHON_INSTALL_DIR=%{python_sitearch} \
-    ..
-make
-popd
-
-%install
-rm -rf %{buildroot}
-pushd build
-make install DESTDIR=%{buildroot}
-popd
-
-mkdir -p %{buildroot}/%{_datadir}/%{php}
-mv %{buildroot}/%{php_extdir}/*.php %{buildroot}/%{_datadir}/%{php}/.
-
-mkdir -p %{buildroot}/%{php_inidir}
-cat >%{buildroot}/%{php_inidir}/kolab.ini <<EOF
-; Kolab libraries
-extension=kolabobject.so
-extension=kolabshared.so
-extension=kolabcalendaring.so
-extension=kolabicalendar.so
-EOF
-
-# Workaround for #2050
-cat >%{buildroot}/%{php_inidir}/kolabdummy.ini <<EOF
-; Kolab libraries
-extension=dummy.so
-EOF
-
-
-touch %{buildroot}/%{python_sitearch}/kolab/__init__.py
-
-%check
-pushd build/tests
-./benchmarktest || :
-./calendaringtest || :
-./formattest || :
-./freebusytest || :
-./icalendartest || :

libkolab.spec Changed

@@ -14,7 +14,7 @@
 %{!?php_extdir: %global php_extdir %{_libdir}/php/modules}
 %endif
 %{!?php_apiver: %global php_apiver  %((echo 0; php -i 2>/dev/null | sed -n 's/^PHP API => //p') | tail -1)}
-
+ 
 # Filter out private python and php libs. Does not work on EPEL5,
 # therefor we use it conditionally
 %{?filter_setup:
@@ -29,16 +29,19 @@
 Name:           libkolab
 %endif
 
-Version:        0.7
-Release:        0.1.dev20150112.gitf0f953aa%{?dist}
+Version:        0.6.0
+Release:        1%{?dist}
 Summary:        Kolab Object Handling Library
 
 License:        LGPLv3+
 URL:            http://git.kolab.org/libkolab
 
-# From 2881447555eb7965f557158c88ae2aa18e936971
 Source0:        http://git.kolab.org/%{name}/snapshot/libkolab-%{version}.tar.gz
 
+Patch0001:      0001-Add-support-for-exceptions.patch
+Patch0002:      0002-Support-for-THISANDFUTURE.patch
+Patch0003:      0003-Move-QT_DECLARE_METADATA-logic-to-cmake.patch
+
 BuildRequires:  cmake
 %if 0%{?rhel} > 6 || 0%{?fedora} > 16
 BuildRequires:  kdepimlibs-devel >= 4.9
@@ -81,6 +84,7 @@
 Requires:       pkgconfig
 Requires:       python-devel
 
+
 %if 0%{?suse_version}
 %description -n libkolab-devel
 %else
@@ -122,6 +126,10 @@
 %prep
 %setup -q -n libkolab-%{version}
 
+%patch0001 -p1
+%patch0002 -p1
+%patch0003 -p1
+
 %build
 rm -rf build
 mkdir -p build
@@ -210,7 +218,7 @@
 
 %files
 %{_libdir}/libkolab.so.0
-%{_libdir}/libkolab.so.0.7
+%{_libdir}/libkolab.so.%{version}
 
 %if 0%{?suse_version}
 %files -n libkolab-devel
@@ -224,6 +232,8 @@
 %files -n php-kolab
 %config(noreplace) %{php_inidir}/kolab.ini
 %config(noreplace) %{php_inidir}/kolabdummy.ini
+%{_datadir}/%{php}/dummy.php
+%{php_extdir}/dummy.so
 %{_datadir}/%{php}/kolabcalendaring.php
 %{php_extdir}/kolabcalendaring.so
 %{_datadir}/%{php}/kolabicalendar.php
@@ -232,8 +242,12 @@
 %{php_extdir}/kolabobject.so
 %{_datadir}/%{php}/kolabshared.php
 %{php_extdir}/kolabshared.so
-%{_datadir}/%{php}/dummy.php
-%{php_extdir}/dummy.so
+%if 0%{?suse_version}
+%dir %{php_inidir}
+%dir %{_datadir}/%{php}
+%dir %{_libdir}/%{php}
+%dir %{php_extdir}
+%endif
 
 %files -n python-kolab
 %dir %{python_sitearch}/kolab/
@@ -248,12 +262,21 @@
 %{python_sitearch}/kolab/shared.py*
 
 %changelog
-* Mon Feb 09 2015 Timotheus Pokorra <tp@tbits.net>
-- master is going towards 0.7
+* Sun Feb 15 2015 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 0.6.0-1
+- Update to version 0.6.0
 
-* Mon Jan 12 2015 Christoph Wickert <wickert@kolabsys.com> - 0.6-0.1.dev20150112.gitf0f953aa
+* Sun Jan 11 2015 Christoph Wickert <wickert@kolabsys.com> - 0.5.3-4
+- Load dummy.so through separate ini file (#2050)
+
+* Wed Dec 10 2014 Christoph Wickert <wickert@kolabsys.com> - 0.5.3-3
+- Actually apply patch to build the dummy plugin (#2050)
+
+* Tue Dec 09 2014 Christoph Wickert <wickert@kolabsys.com> - 0.5.3-2
 - Add dummy plugin to workaround httpd reload issue (#2050)
 
+* Tue Aug 26 2014 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 0.5.3-1
+- New upstream release 0.5.3
+
 * Mon Oct 14 2013 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 0.5.0-1
 - New upstream release

0001-Add-support-for-exceptions.patch Added

@@ -0,0 +1,262 @@
+From ad9c52c79a3b5de87bfa7a3f45e207e6d6ee1d4b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Sandro=20Knau=C3=9F?= <mail@sandroknauss.de>
+Date: Wed, 18 Feb 2015 16:54:47 +0100
+Subject: [PATCH 1/2] Add support for exceptions.
+
+Read/Write Exceptions to iCal.
+
+KOLAB: #4618
+---
+ icalendar/icalendar.cpp                       | 34 +++++++++++++++--
+ tests/icalendartest.cpp                       | 53 ++++++++++++++++++++++++++-
+ tests/icalendartest.h                         |  3 ++
+ tests/testfiles/v3/event/errorswithsameid.ics | 45 +++++++++++++++++++++++
+ tests/testfiles/v3/event/exceptions.ics       | 35 ++++++++++++++++++
+ 5 files changed, 166 insertions(+), 4 deletions(-)
+ create mode 100644 tests/testfiles/v3/event/errorswithsameid.ics
+ create mode 100644 tests/testfiles/v3/event/exceptions.ics
+
+diff --git a/icalendar/icalendar.cpp b/icalendar/icalendar.cpp
+index be7c0e6..3ed41ae 100644
+--- a/icalendar/icalendar.cpp
++++ b/icalendar/icalendar.cpp
+@@ -39,13 +39,21 @@ std::string toICal(const std::vector<Event> &events)
+     KCalCore::Calendar::Ptr calendar(new KCalCore::MemoryCalendar(Kolab::Conversion::getTimeSpec(true, std::string())));
+     foreach (const Event &event, events) {
+         KCalCore::Event::Ptr kcalEvent = Conversion::toKCalCore(event);
+-        kcalEvent->setCreated(KDateTime::currentUtcDateTime()); //sets dtstamp
++        if (!kcalEvent->created().isValid()) {
++            kcalEvent->setCreated(KDateTime::currentUtcDateTime()); //sets dtstamp
++        }
+         calendar->addEvent(kcalEvent);
++        foreach(const Event &exception, event.exceptions()) {
++            KCalCore::Event::Ptr kcalException = Conversion::toKCalCore(exception);
++            if (!kcalException->created().isValid()) {
++                kcalException->setCreated(KDateTime::currentUtcDateTime()); //sets dtstamp
++            }
++            calendar->addEvent(kcalException);
++        }
+     }
+     KCalCore::ICalFormat format;
+     format.setApplication("libkolab", LIBKOLAB_LIB_VERSION_STRING);
+ //     qDebug() << format.createScheduleMessage(calendar->events().first(), KCalCore::iTIPRequest);
+-
+     return Conversion::toStdString(format.toString(calendar));
+     
+ }
+@@ -57,8 +65,28 @@ std::vector< Event > fromICalEvents(const std::string &input)
+     format.setApplication("libkolab", LIBKOLAB_LIB_VERSION_STRING);
+     format.fromString(calendar, Conversion::fromStdString(input));
+     std::vector<Event> events;
++    QMap< QString, int > uidMap;
+     foreach (const KCalCore::Event::Ptr &event, calendar->events()) {
+-        events.push_back(Conversion::fromKCalCore(*event));
++        Event e = Conversion::fromKCalCore(*event);
++        if (!e.recurrenceID().isValid()) {
++            if (uidMap.contains(event->uid())) {
++                e.setExceptions(events.at(uidMap[event->uid()]).exceptions());
++                events[uidMap[event->uid()]] = e;
++            } else {
++                events.push_back(e);
++                uidMap.insert(event->uid(), events.size()-1);
++            }
++        } else {
++            if (!uidMap.contains(event->uid())) {
++                Event e;
++                e.setUid("");
++                events.push_back(e);
++                uidMap.insert(event->uid(), events.size()-1);
++            }
++            std::vector<Event> exceptions = events.at( uidMap[event->uid()]).exceptions();
++            exceptions.push_back(e);
++            events.at(uidMap[event->uid()]).setExceptions(exceptions);
++        }
+     }
+     return events;
+ }
+diff --git a/tests/icalendartest.cpp b/tests/icalendartest.cpp
+index 1e13d65..b1dd60b 100644
+--- a/tests/icalendartest.cpp
++++ b/tests/icalendartest.cpp
+@@ -24,6 +24,8 @@
+ #include "icalendar/icalendar.h"
+ 
+ #include "testhelpers.h"
++#include "testutils.h"
++#include <kolabformat/kolabobject.h>
+ 
+ void ICalendarTest::testFromICalEvent()
+ {
+@@ -32,11 +34,60 @@ void ICalendarTest::testFromICalEvent()
+     ev1.setStart(Kolab::cDateTime(2011,10,10,12,1,1,true));
+     ev1.setEnd(Kolab::cDateTime(2011,10,11,12,1,1,true));
+     events.push_back(ev1);
+-    events.push_back(ev1);
+     const std::vector<Kolab::Event> &result = Kolab::fromICalEvents(Kolab::toICal(events));
+     qDebug() << QString::fromStdString(Kolab::toICal(result));
+ }
+ 
++void ICalendarTest::testFromICalEventWithExceptions()
++{
++    QFile icalFile( getPath("v3/event/exceptions.ics") );
++    QVERIFY( icalFile.open( QFile::ReadOnly ) );
++    std::vector<Kolab::Event> events = Kolab::fromICalEvents(icalFile.readAll().constData());
++    QCOMPARE((int)events.size(), 1);
++    Kolab::Event out = events.at(0);
++    QCOMPARE((int)out.exceptions().size(), 2);
++}
++
++void ICalendarTest::testFromICalEventErrorsWithSameID()
++{
++    /* This is not a really usecase, it should make sure,
++     * that the underlying KCalCore strips out events with same uid/or recurrenceID.
++     * 2015/02/18: KCaclCore is only returns one event with one exception for the icalFile
++     * testdata/v3/event/errorswithsameid.ics
++     */
++    QFile icalFile( getPath("v3/event/errorswithsameid.ics") );
++    QVERIFY( icalFile.open( QFile::ReadOnly ) );
++    std::vector<Kolab::Event> events = Kolab::fromICalEvents(icalFile.readAll().constData());
++    QCOMPARE((int)events.size(), 1);
++    Kolab::Event out = events.at(0);
++    QCOMPARE((int)out.exceptions().size(), 1);
++}
++
++void ICalendarTest::testReadWriteForEventWithExceptions()
++{
++    std::vector<Kolab::Event> events;
++    Kolab::Event ev1;
++    ev1.setUid("uid");
++    ev1.setStart(Kolab::cDateTime(2011,10,10,12,1,1,true));
++    ev1.setEnd(Kolab::cDateTime(2011,10,11,12,1,1,true));
++    std::vector<Kolab::Event> exceptions;
++    Kolab::Event ex1;
++    ex1.setUid(ev1.uid());
++    ex1.setRecurrenceID(Kolab::cDateTime(2011,10,11,12,1,1,true), false);
++    exceptions.push_back(ex1);
++    ev1.setExceptions(exceptions);
++    Kolab::RecurrenceRule rrule;
++    rrule.setInterval(1);
++    rrule.setFrequency(Kolab::RecurrenceRule::Daily);
++    ev1.setRecurrenceRule(rrule);
++    events.push_back(ev1);
++    const std::vector<Kolab::Event> &result = Kolab::fromICalEvents(Kolab::toICal(events));
++    Kolab::Event out = result.at(0);
++    QCOMPARE((int)result.size(), 1);
++    QCOMPARE((int)out.exceptions().size(), 1);
++    QCOMPARE(out.exceptions().at(0).recurrenceID(), ex1.recurrenceID());
++}
++
+ void ICalendarTest::testToICal()
+ {
+     std::vector<Kolab::Event> events;
+diff --git a/tests/icalendartest.h b/tests/icalendartest.h
+index 4f82ecc..7e1f405 100644
+--- a/tests/icalendartest.h
++++ b/tests/icalendartest.h
+@@ -27,6 +27,9 @@ private slots:
+ //     void testEventConflict_data();
+     void testToICal();
+     void testFromICalEvent();
++    void testFromICalEventWithExceptions();
++    void testReadWriteForEventWithExceptions();
++    void testFromICalEventErrorsWithSameID();
+ 
+     void testToITip();
+     void testToIMip();
+diff --git a/tests/testfiles/v3/event/errorswithsameid.ics b/tests/testfiles/v3/event/errorswithsameid.ics
+new file mode 100644
+index 0000000..1aa12a3
+--- /dev/null
++++ b/tests/testfiles/v3/event/errorswithsameid.ics
+@@ -0,0 +1,45 @@
++BEGIN:VCALENDAR
++VERSION:2.0
++PRODID:-//Test//
++CALSCALE:GREGORIAN
++BEGIN:VEVENT
++UID:D5A98F4AD36FE911EC7FB8F89209C4E3-FCBB6C4091F28CA0
++DTSTAMP;VALUE=DATE-TIME:20150216T000000Z
++CREATED;VALUE=DATE-TIME:20150216T000000Z
++LAST-MODIFIED;VALUE=DATE-TIME:20150216T000000Z
++RRULE:FREQ=DAILY;INTERVAL=1
++SUMMARY:Daily
++DTSTART;VALUE=DATE-TIME:20150101T010000Z
++DTEND;VALUE=DATE-TIME:20150101T020000Z
++END:VEVENT
++BEGIN:VEVENT
++UID:D5A98F4AD36FE911EC7FB8F89209C4E3-FCBB6C4091F28CA0
++DTSTAMP;VALUE=DATE-TIME:20150216T000000Z
++CREATED;VALUE=DATE-TIME:20150216T000000Z
++LAST-MODIFIED;VALUE=DATE-TIME:20150216T000000Z
++RECURRENCE-ID;VALUE=DATE-TIME;RANGE=THISANDFUTURE:20150103T000000Z
++SUMMARY:thisandfuture
++DTSTART;VALUE=DATE-TIME:20150103T020000Z
++DTEND;VALUE=DATE-TIME:20150103T030000Z
++END:VEVENT
++BEGIN:VEVENT
++UID:D5A98F4AD36FE911EC7FB8F89209C4E3-FCBB6C4091F28CA0
++DTSTAMP;VALUE=DATE-TIME:20150216T000000Z
++CREATED;VALUE=DATE-TIME:20150216T000000Z

0002-Support-for-THISANDFUTURE.patch Added

@@ -0,0 +1,130 @@
+From b756fa4ceef4b953859878f3c700ed45ecaed409 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Sandro=20Knau=C3=9F?= <mail@sandroknauss.de>
+Date: Wed, 18 Feb 2015 16:50:59 +0100
+Subject: [PATCH 2/2] Support for THISANDFUTURE
+
+convert ThisAndFuture from/to iCal.
+
+KOLAB: 4654
+---
+ conversion/kcalconversion.cpp |  7 ++++---
+ tests/icalendartest.cpp       |  3 ++-
+ tests/kcalconversiontest.cpp  | 20 ++++++++++++++++++--
+ 3 files changed, 24 insertions(+), 6 deletions(-)
+
+diff --git a/conversion/kcalconversion.cpp b/conversion/kcalconversion.cpp
+index a82b6a2..b06a5d0 100644
+--- a/conversion/kcalconversion.cpp
++++ b/conversion/kcalconversion.cpp
+@@ -661,7 +661,8 @@ void setTodoEvent(KCalCore::Incidence &i, const T &e)
+         i.setNonKDECustomProperty(CUSTOM_KOLAB_URL, fromStdString(e.url()));
+     }
+     if (e.recurrenceID().isValid()) {
+-        i.setRecurrenceId(toDate(e.recurrenceID())); //TODO THISANDFUTURE
++        i.setRecurrenceId(toDate(e.recurrenceID()));
++        i.setThisAndFuture(e.thisAndFuture());
+     }
+     setRecurrence(i, e);
+     foreach (const Kolab::Alarm a, e.alarms()) {
+@@ -699,7 +700,7 @@ void setTodoEvent(KCalCore::Incidence &i, const T &e)
+         alarm->setSnoozeTime(toDuration(a.duration()));
+         alarm->setRepeatCount(a.numrepeat());
+         alarm->setEnabled(true);
+-        i.addAlarm(alarm);       
++        i.addAlarm(alarm);
+     }
+ }
+ 
+@@ -712,7 +713,7 @@ void getTodoEvent(T &i, const I &e)
+         i.setOrganizer(Kolab::ContactReference(Kolab::ContactReference::EmailReference, toStdString(e.organizer()->email()), toStdString(e.organizer()->name()))); //TODO handle uid too
+     }
+     i.setUrl(toStdString(e.nonKDECustomProperty(CUSTOM_KOLAB_URL)));
+-    i.setRecurrenceID(fromDate(e.recurrenceId()), false); //TODO THISANDFUTURE
++    i.setRecurrenceID(fromDate(e.recurrenceId()), e.thisAndFuture());
+     getRecurrence(i, e);
+     std::vector <Kolab::Alarm> alarms;
+     foreach (const KCalCore::Alarm::Ptr &a, e.alarms()) {
+diff --git a/tests/icalendartest.cpp b/tests/icalendartest.cpp
+index b1dd60b..bf55031 100644
+--- a/tests/icalendartest.cpp
++++ b/tests/icalendartest.cpp
+@@ -73,7 +73,7 @@ void ICalendarTest::testReadWriteForEventWithExceptions()
+     std::vector<Kolab::Event> exceptions;
+     Kolab::Event ex1;
+     ex1.setUid(ev1.uid());
+-    ex1.setRecurrenceID(Kolab::cDateTime(2011,10,11,12,1,1,true), false);
++    ex1.setRecurrenceID(Kolab::cDateTime(2011,10,11,12,1,1,true), true);
+     exceptions.push_back(ex1);
+     ev1.setExceptions(exceptions);
+     Kolab::RecurrenceRule rrule;
+@@ -86,6 +86,7 @@ void ICalendarTest::testReadWriteForEventWithExceptions()
+     QCOMPARE((int)result.size(), 1);
+     QCOMPARE((int)out.exceptions().size(), 1);
+     QCOMPARE(out.exceptions().at(0).recurrenceID(), ex1.recurrenceID());
++    QCOMPARE(out.exceptions().at(0).thisAndFuture(), true);
+ }
+ 
+ void ICalendarTest::testToICal()
+diff --git a/tests/kcalconversiontest.cpp b/tests/kcalconversiontest.cpp
+index c62a8e0..e1d4ca9 100644
+--- a/tests/kcalconversiontest.cpp
++++ b/tests/kcalconversiontest.cpp
+@@ -162,7 +162,7 @@ void KCalConversionTest::testConversion_data()
+         kcal.setDtEnd(toDate(date2));
+         kcal.setTransparency(KCalCore::Event::Transparent);
+         
+-        kcal.setRecurrenceId(toDate(date2)); //TODO THISANDFUTURE
++        kcal.setRecurrenceId(toDate(date2));
+         kcal.recurrence()->setDaily(3);
+         kcal.recurrence()->setDuration(5);
+         kcal.recurrence()->addRDateTime(toDate(date2));
+@@ -231,7 +231,7 @@ void KCalConversionTest::testConversion_data()
+         rrule.setBymonth(intVector);
+         
+         kolab.setRecurrenceRule(rrule);
+-        kolab.setRecurrenceID(date2, true);
++        kolab.setRecurrenceID(date2, false);
+         kolab.setRecurrenceDates(std::vector<Kolab::cDateTime>() << date2 << Kolab::cDateTime(date2.year(), date2.month(), date2.day()));
+         kolab.setExceptionDates(std::vector<Kolab::cDateTime>() << date3 << Kolab::cDateTime(date3.year(), date3.month(), date3.day()));
+         
+@@ -337,7 +337,21 @@ void KCalConversionTest::testConversion_data()
+         kolab.setSummary(std::string(QString("äöü%@$£é¤¼²°€Š�").toUtf8().constData()));
+         
+         QTest::newRow("latin1+Unicode") << kcal << kolab;
++    }
++    {
++        KCalCore::Event kcal;
++        kcal.setUid("uid");
++        kcal.setCreated(toDate(date));
++        kcal.setLastModified(toDate(date));
++        kcal.setRecurrenceId(toDate(date));
++        kcal.setThisAndFuture(true);
+ 
++        Kolab::Event kolab;
++        kolab.setUid("uid");
++        kolab.setCreated(date);
++        kolab.setLastModified(date);
++        kolab.setRecurrenceID(date, true);
++        QTest::newRow("thisandfuture") << kcal << kolab;
+     }
+ }
+ 
+@@ -361,6 +375,7 @@ void KCalConversionTest::testConversion()
+     QCOMPARE(e->transparency(), kcal.transparency());
+     QCOMPARE(*e->recurrence(), *kcal.recurrence());
+     QCOMPARE(e->recurrenceId(), kcal.recurrenceId());
++    QCOMPARE(e->thisAndFuture(), kcal.thisAndFuture());
+     QCOMPARE(e->recurrenceType(), kcal.recurrenceType());
+     QCOMPARE(e->summary(), kcal.summary());
+     QCOMPARE(e->description(), kcal.description());
+@@ -396,6 +411,7 @@ void KCalConversionTest::testConversion()
+     
+     QCOMPARE(b.recurrenceRule(), kolab.recurrenceRule());
+     QCOMPARE(b.recurrenceID(), kolab.recurrenceID());
++    QCOMPARE(b.thisAndFuture(), kolab.thisAndFuture());
+     QCOMPARE(b.recurrenceDates(), kolab.recurrenceDates());
+     QCOMPARE(b.exceptionDates(), kolab.exceptionDates());
+     
+-- 
+2.1.0
+

0003-Move-QT_DECLARE_METADATA-logic-to-cmake.patch Added

@@ -0,0 +1,50 @@
+From e397921e73de2926a8572dfed73d2730a3ae456e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Sandro=20Knau=C3=9F?= <mail@sandroknauss.de>
+Date: Thu, 19 Feb 2015 12:32:58 +0100
+Subject: [PATCH 3/3] Move QT_DECLARE_METADATA logic to cmake
+
+Because libcalendaring now also have versions that
+Q_DECLARE_METATYPE(KCalCore::Duration) already we make it explicit once
+within cmake and once inside libcalendaring.
+---
+ CMakeLists.txt      | 4 ++++
+ tests/testhelpers.h | 8 ++------
+ 2 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index a323b32..02783e2 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -82,6 +82,10 @@ if("${KdepimLibs_VERSION}" VERSION_GREATER "4.8.40" OR USE_LIBCALENDARING)
+     add_definitions(-DKDEPIMLIBS_VERSION_DEVEL)
+ endif()
+ 
++if ("${KdepimLibs_VERSION}" VERSION_GREATER  "4.11.52")
++    add_definitions( -DLIBCALENDARING_DURATION_DECLARED)
++endif()
++
+ set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wformat-security -fno-exceptions -DQT_NO_EXCEPTIONS -fno-common -Woverloaded-virtual -fno-threadsafe-statics -fvisibility=hidden -Werror=return-type -fvisibility-inlines-hidden -fexceptions -UQT_NO_EXCEPTIONS -fPIC -g" )
+ # message("${CMAKE_CXX_FLAGS}")
+ set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DQT_NO_DEBUG")
+diff --git a/tests/testhelpers.h b/tests/testhelpers.h
+index f0e3889..822f9bc 100644
+--- a/tests/testhelpers.h
++++ b/tests/testhelpers.h
+@@ -45,12 +45,8 @@ Q_DECLARE_METATYPE(KCalCore::Event);
+ Q_DECLARE_METATYPE(KCalCore::Todo);
+ Q_DECLARE_METATYPE(KCalCore::Journal);
+ 
+-#if KDEPIMLIBS_VERSION_MAJOR <= 4
+-#if KDEPIMLIBS_VERSION_MINOR <= 11
+-#if KDEPIMLIBS_VERSION_PATCH < 52
+-Q_DECLARE_METATYPE(KCalCore::Duration);
+-#endif
+-#endif
++#ifndef LIBCALENDARING_DURATION_DECLARED
++    Q_DECLARE_METATYPE(KCalCore::Duration);
+ #endif
+ 
+ namespace QTest {
+-- 
+2.1.0
+

libkolab-0.4.2-cmake-2.8.11.patch Deleted

_service Deleted

_service:recompress:tar_scm:libkolab-0.6.git.1424370877.tar.gz Deleted

_service:set_version:libkolab.dsc Deleted

@@ -1,34 +0,0 @@
-Format: 1.0
-Source: libkolab
-Binary: libkolab0, php-kolab, python-kolab, libkolab-dev
-Architecture: any
-Version: 0.6.git.1424370877
-Maintainer: Debian Kolab Maintainers <pkg-kolab-devel@lists.alioth.debian.org>
-Uploaders: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>, Christoph Wickert <wickert@kolabsys.com>, Paul Klos <kolab@klos2day.nl>
-Homepage: http://git.kolab.org/libkolab
-Standards-Version: 3.9.3
-Build-Depends:
-	cmake,
-	debhelper,
-	libboost-dev,
-    libboost-program-options-dev,
-	libboost-thread-dev,
-	libboost-system-dev,
-	libcalendaring-dev (>= 4.9.0),
-	libcurl4-gnutls-dev,
-	libkolabxml-dev (>= 1.0),
-	libossp-uuid-dev,
-	libqt4-dev,
-	libxerces-c-dev,
-    php5-cli,
-	php5-dev,
-	python-dev,
-	swig (>= 2.0)
-Package-List: 
- libkolab-dev deb libdevel optional
- libkolab0 deb libs optional
- php-kolab deb libs optional
- python-kolab deb python optional
-Files: 
- 00000000000000000000000000000000 0 libkolab-0.6.tar.gz
- 00000000000000000000000000000000 0 debian.tar.gz

debian.changelog Changed

@@ -1,26 +1,56 @@
-libkolab (0.6~dev20150112-0~kolab2)  unstable; urgency=low
+libkolab (0.6.0-0~kolab1) unstable; urgency=low
 
-  * make sure the dummy plugin is loaded before all other plugins to workaround httpd reload issue (#2050)
+  * Update to version 0.6.0
 
- -- Timotheus Pokorra <tp@tbits.net>  Thu, 22 January 2015 13:36:13 +0100
+ -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Sun, 15 Feb 2014 14:42:32 +0200
 
-libkolab (0.6~dev20150112-0~kolab1)  unstable; urgency=low
+libkolab (0.5.3-0~kolab7) unstable; urgency=low
+
+  * Make dummy plugin a module to get different priorities (#2050)
+
+ -- Christoph Wickert <wickert@kolabsys.com>  Sun, 11 January 2015 17:07:41 +0100
+
+libkolab (0.5.3-0~kolab6) unstable; urgency=low
+
+  * Load dummy.so through separate ini file (#2050)
+
+ -- Christoph Wickert <wickert@kolabsys.com>  Sun, 11 January 2015 16:08:01 +0100
+
+libkolab (0.5.3-0~kolab5) unstable; urgency=low
+
+  * Bump version
+
+ -- Christoph Wickert <wickert@kolabsys.com>  Sat, 10 January 2015 16:16:21 +0100
+
+libkolab (0.5.3-0~kolab4) unstable; urgency=low
+
+  * Make sure dummy plugin gets loaded (#2050)
+
+ -- Christoph Wickert <wickert@kolabsys.com>  Sat, 10 January 2015 17:33:43 +0100
+ 
+libkolab (0.5.3-0~kolab3) unstable; urgency=low
 
   * Add dummy plugin to workaround httpd reload issue (#2050)
 
- -- Christoph Wickert <wickert@kolabsys.com>  Mon, 12 January 2015 13:36:13 +0100
+ -- Christoph Wickert <wickert@kolabsys.com>  Fri, 09 December 2014 17:57:13 +0100
+
+libkolab (0.5.3-0~kolab2) unstable; urgency=low
+
+  * Provide kolab/__init__.py so that it is a Python module
+
+ -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Tue, 18 Nov 2014 14:42:32 +0200
 
-libkolab (0.6~dev20140624-0~kolab1) unstable; urgency=low
+libkolab (0.5.3-0~kolab1) unstable; urgency=low
 
-  * New git master head snapshot
+  * New upstream release 0.5.3
 
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Tue, 24 Jun 2014 09:00:00 +0100
+ -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Tue, 26 Aug 2014 14:42:32 +0200
 
 libkolab (0.5.0-0~kolab5) unstable; urgency=low
 
-  * Work around php5dismod not being available on UCS 3.2
+  * Make sure php-kolab.prerm does not depend on the existence of php5dismod
 
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Wed, 09 Apr 2014 09:00:00 +0100
+ -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Wed, 09 Jul 2014 14:42:32 +0200
 
 libkolab (0.5.0-0~kolab4) unstable; urgency=low

debian.rules Changed

debian.series Changed

debian.tar.gz/php-kolab.postinst Changed

debian.tar.gz/usr/share/php5/kolab/kolab.ini Changed

debian.tar.gz/usr/share/php5/kolabdummy/kolabdummy.ini Changed

libkolab-0.6.0.tar.gz Added

libkolab.dsc Changed

Changes of Revision 78