From 31bd515f784812a8dfda05faf5b4dde8445e7d42 Mon Sep 17 00:00:00 2001
From: Damien Caliste <dcaliste@free.fr>
Date: Thu, 19 Nov 2020 10:37:03 +0100
Subject: [PATCH] [nemo-qml-plugin-calendar] Clean spec file and remove
 obsolete libical dependency.

---
 lightweight/calendardataservice/calendardataservice.pro | 2 +-
 rpm/nemo-qml-plugin-calendar-qt5.spec                   | 9 ++-------
 src/calendarworker.cpp                                  | 3 ---
 src/src.pro                                             | 2 +-
 4 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/lightweight/calendardataservice/calendardataservice.pro b/lightweight/calendardataservice/calendardataservice.pro
index 8667c34..cfe937d 100644
--- a/lightweight/calendardataservice/calendardataservice.pro
+++ b/lightweight/calendardataservice/calendardataservice.pro
@@ -6,7 +6,7 @@ QT += qml dbus
 QT -= gui
 
 CONFIG += link_pkgconfig
-PKGCONFIG += KF5CalendarCore libmkcal-qt5 libical accounts-qt5
+PKGCONFIG += KF5CalendarCore libmkcal-qt5 accounts-qt5
 
 HEADERS += \
     calendardataservice.h \
diff --git a/rpm/nemo-qml-plugin-calendar-qt5.spec b/rpm/nemo-qml-plugin-calendar-qt5.spec
index bab9488..1106643 100644
--- a/rpm/nemo-qml-plugin-calendar-qt5.spec
+++ b/rpm/nemo-qml-plugin-calendar-qt5.spec
@@ -3,9 +3,8 @@ Name:       nemo-qml-plugin-calendar-qt5
 Summary:    Calendar plugin for Nemo Mobile
 Version:    0.6.13
 Release:    1
-Group:      System/Libraries
 License:    BSD
-URL:        https://git.merproject.org/mer-core/nemo-qml-plugin-calendar
+URL:        https://git.sailfishos.org/mer-core/nemo-qml-plugin-calendar
 Source0:    %{name}-%{version}.tar.bz2
 BuildRequires:  pkgconfig(Qt5Core)
 BuildRequires:  pkgconfig(Qt5Gui)
@@ -13,7 +12,6 @@ BuildRequires:  pkgconfig(Qt5Qml)
 BuildRequires:  pkgconfig(Qt5Concurrent)
 BuildRequires:  pkgconfig(libmkcal-qt5)
 BuildRequires:  pkgconfig(KF5CalendarCore)
-BuildRequires:  pkgconfig(libical)
 BuildRequires:  pkgconfig(accounts-qt5)
 
 %description
@@ -21,7 +19,6 @@ BuildRequires:  pkgconfig(accounts-qt5)
 
 %package tests
 Summary:    QML calendar plugin tests
-Group:      System/Libraries
 BuildRequires:  pkgconfig(Qt5Test)
 Requires:   %{name} = %{version}-%{release}
 
@@ -30,7 +27,6 @@ Requires:   %{name} = %{version}-%{release}
 
 %package lightweight
 Summary:    Calendar lightweight QML plugin
-Group:      System/Libraries
 BuildRequires:  pkgconfig(Qt5DBus)
 
 %description lightweight
@@ -39,7 +35,6 @@ BuildRequires:  pkgconfig(Qt5DBus)
 %package tools
 Summary:    Calendar import/export tool
 License:    BSD
-Group:      Applications/System
 BuildRequires:  pkgconfig(libmkcal-qt5)
 BuildRequires:  pkgconfig(KF5CalendarCore)
 
@@ -53,7 +48,7 @@ BuildRequires:  pkgconfig(KF5CalendarCore)
 
 %qmake5 
 
-make %{?jobs:-j%jobs}
+make %{?_smp_mflags}
 
 %install
 rm -rf %{buildroot}
diff --git a/src/calendarworker.cpp b/src/calendarworker.cpp
index 05ee379..dec2834 100644
--- a/src/calendarworker.cpp
+++ b/src/calendarworker.cpp
@@ -50,9 +50,6 @@
 #include <KCalendarCore/RecurrenceRule>
 #include <KCalendarCore/MemoryCalendar>
 
-#include <libical/vobject.h>
-#include <libical/vcaltmp.h>
-
 // libaccounts-qt
 #include <Accounts/Manager>
 #include <Accounts/Provider>
diff --git a/src/src.pro b/src/src.pro
index 40daf98..f728109 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -9,7 +9,7 @@ QT -= gui
 QMAKE_CXXFLAGS += -Werror
 
 target.path = $$[QT_INSTALL_QML]/$$PLUGIN_IMPORT_PATH
-PKGCONFIG += KF5CalendarCore libmkcal-qt5 libical accounts-qt5
+PKGCONFIG += KF5CalendarCore libmkcal-qt5 accounts-qt5
 
 INSTALLS += target