Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[nemo-qml-plugin-calendar] Clean spec file and remove obsolete libica…
…l dependency.
  • Loading branch information
dcaliste committed Jan 28, 2021
1 parent 7d4d768 commit 31bd515
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 12 deletions.
2 changes: 1 addition & 1 deletion lightweight/calendardataservice/calendardataservice.pro
Expand Up @@ -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 \
Expand Down
9 changes: 2 additions & 7 deletions rpm/nemo-qml-plugin-calendar-qt5.spec
Expand Up @@ -3,25 +3,22 @@ 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)
BuildRequires: pkgconfig(Qt5Qml)
BuildRequires: pkgconfig(Qt5Concurrent)
BuildRequires: pkgconfig(libmkcal-qt5)
BuildRequires: pkgconfig(KF5CalendarCore)
BuildRequires: pkgconfig(libical)
BuildRequires: pkgconfig(accounts-qt5)

%description
%{summary}.

%package tests
Summary: QML calendar plugin tests
Group: System/Libraries
BuildRequires: pkgconfig(Qt5Test)
Requires: %{name} = %{version}-%{release}

Expand All @@ -30,7 +27,6 @@ Requires: %{name} = %{version}-%{release}

%package lightweight
Summary: Calendar lightweight QML plugin
Group: System/Libraries
BuildRequires: pkgconfig(Qt5DBus)

%description lightweight
Expand All @@ -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)

Expand All @@ -53,7 +48,7 @@ BuildRequires: pkgconfig(KF5CalendarCore)

%qmake5

make %{?jobs:-j%jobs}
make %{?_smp_mflags}

%install
rm -rf %{buildroot}
Expand Down
3 changes: 0 additions & 3 deletions src/calendarworker.cpp
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/src.pro
Expand Up @@ -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

Expand Down

0 comments on commit 31bd515

Please sign in to comment.