Request 873 (accepted)

Overview

Request 873 (accepted)

fix kolab-utils for CentOS7 and Fedora21: use libcalendaring instead of kdepimlibs-devel.
add a patch for kolab-formatupgrade (#4869)

Created by tpokorra about 9 years ago
In state accepted

Submit libkolab

Submit package home:tpokorra:b...ab:3.4:Updates / libkolab to package Kolab:3.4:Updates / libkolab

libkolab.spec Changed

@@ -41,9 +41,10 @@
 Patch0001:      0001-Add-support-for-exceptions.patch
 Patch0002:      0002-Support-for-THISANDFUTURE.patch
 Patch0003:      0003-Move-QT_DECLARE_METADATA-logic-to-cmake.patch
+Patch0004:      0004-kolabformat-upgrade-fix-excluded-dates.patch
 
 BuildRequires:  cmake
-%if 0%{?rhel} > 6 || 0%{?fedora} > 16
+%if 0%{?rhel} > 7 || 0%{?fedora} > 21
 BuildRequires:  kdepimlibs-devel >= 4.9
 %else
 # Note: available within kolabsys.com infrastructure only, as being (essentially) a
@@ -72,7 +73,7 @@
 %endif
 Summary:        Kolab library development headers
 Requires:       libkolab%{?_isa} = %{version}
-%if 0%{?rhel} > 6 || 0%{?fedora} > 16
+%if 0%{?rhel} > 7 || 0%{?fedora} > 21
 BuildRequires:  kdepimlibs-devel >= 4.9
 %else
 # Note: available within kolabsys.com infrastructure only, as being (essentially) a
@@ -129,6 +130,7 @@
 %patch0001 -p1
 %patch0002 -p1
 %patch0003 -p1
+%patch0004 -p1
 
 %build
 rm -rf build
@@ -160,7 +162,7 @@
     -DBoost_NO_BOOST_CMAKE=TRUE \
     -Wno-fatal-errors -Wno-errors \
     -DINCLUDE_INSTALL_DIR=%{_includedir} \
-%if 0%{?rhel} < 7 && 0%{?fedora} < 17
+%if 0%{?rhel} < 8 && 0%{?fedora} < 22
     -DUSE_LIBCALENDARING=ON \
 %endif
     -DPHP_BINDINGS=ON \

0004-kolabformat-upgrade-fix-excluded-dates.patch Added

@@ -0,0 +1,48 @@
+From e50a71feb985a3e8c4ec4df595acfcd1287227bd Mon Sep 17 00:00:00 2001
+From: Timotheus Pokorra <tp@tbits.net>
+Date: Wed, 18 Mar 2015 15:21:29 +0100
+Subject: [PATCH] need to format excluded dates of recurring events in ISO date format
+ fixing #4869
+
+---
+ kolabformatV2/incidence.cpp |   17 ++++++++++++++++-
+ 1 files changed, 16 insertions(+), 1 deletions(-)
+
+diff --git a/kolabformatV2/incidence.cpp b/kolabformatV2/incidence.cpp
+index 9f0e381..804563a 100644
+--- a/kolabformatV2/incidence.cpp
++++ b/kolabformatV2/incidence.cpp
+@@ -41,6 +41,8 @@
+ #include <kurl.h>
+ 
+ #include <QBitArray>
++#include <string>
++#include <boost/algorithm/string.hpp>
+ 
+ using namespace KolabV2;
+ 
+@@ -357,7 +359,20 @@ void Incidence::loadRecurrence( const QDomElement& element )
+         mRecurrence.rangeType = e.attribute( "type" );
+         mRecurrence.range = e.text();
+       } else if ( tagName == "exclusion" ) {
+-        mRecurrence.exclusions.append( stringToDate( e.text() ) );
++        std::string exclusionDate = e.text().toStdString();
++        // need to fix the date, eg. 2013-1-1 to ISO format 2013-01-01
++        if (exclusionDate.length() != 10) {
++          std::vector<std::string> strs;
++          boost::split(strs, exclusionDate, boost::is_any_of("-"));
++          char buff[100];
++          sprintf(buff, "%04d-%02d-%02d",
++              QString::fromStdString(strs[0]).toInt(),
++              QString::fromStdString(strs[1]).toInt(),
++              QString::fromStdString(strs[2]).toInt()
++            );
++          exclusionDate = buff;
++        }
++        mRecurrence.exclusions.append( stringToDate( QString::fromStdString(exclusionDate) ) );
+       } else
+         // TODO: Unhandled tag - save for later storage
+         kDebug() <<"Warning: Unhandled tag" << e.tagName();
+-- 
+1.7.1
+

debian.series Changed

Build Results
RPM Lint

Refresh

Comments for request 873 0

Request History

tpokorra created request about 9 years ago

fix kolab-utils for CentOS7 and Fedora21: use libcalendaring instead of kdepimlibs-devel.
add a patch for kolab-formatupgrade (#4869)

timotheus accepted request about 9 years ago

works for me