Merge branch 'alarms' into 'master'

Set / clear alarm on notebook visibility change See merge request mer-core/mkcal!34
sailfishos · Mar 13, 2020 · c846281 · c846281
2 parents f20c086 + 5edcca8
commit c846281
Show file tree

Hide file tree

Showing 7 changed files with 215 additions and 255 deletions.
diff --git a/rpm/mkcal-qt5.spec b/rpm/mkcal-qt5.spec
@@ -13,10 +13,13 @@ Requires(postun): /sbin/ldconfig
 BuildRequires:  pkgconfig(Qt5Core)
 BuildRequires:  pkgconfig(Qt5Gui)
 BuildRequires:  pkgconfig(Qt5DBus)
-BuildRequires:  pkgconfig(libkcalcoren-qt5)
+BuildRequires:  kcalcore-qt5-devel >= 4.10.2+9git23
 BuildRequires:  pkgconfig(sqlite3)
 BuildRequires:  pkgconfig(timed-qt5) >= 2.88
 BuildRequires:  pkgconfig(QmfClient)
+Requires:  kcalcore-qt5 >= 4.10.2+9git23
+# One cannot use the pkgconfig test for kcalcore because the version is not update
+# there due to local patching.
 
 %description
 Extended KDE kcal calendar library port for Maemo