support bootstrap, %check: enable tests (advisory)

kf5-knotifications.spec

@@ -1,12 +1,19 @@
 %global framework knotifications
 
+# uncomment to enable bootstrap mode
+#global bootstrap 1
+
+%if !0%{?bootstrap}
+%global tests 1
+%endif
+
 Name:           kf5-%{framework}
 Version:        5.21.0
-Release:        1%{?dist}
+Release:        1%{?dist}.6
 Summary:        KDE Frameworks 5 Tier 2 solution with abstraction for system notifications
 
 License:        LGPLv2+
-URL:            http://projects.kde.org/knotifications
+URL:            https://quickgit.kde.org/?p=%{framework}.git
 
 %global versiondir %(echo %{version} | cut -d. -f1-2)
 %global revision %(echo %{version} | cut -d. -f3)
@@ -17,8 +24,6 @@ URL:            http://projects.kde.org/knotifications
 %endif
 Source0:        http://download.kde.org/%{stable}/frameworks/%{versiondir}/%{framework}-%{version}.tar.xz
 
-# https://bugs.kde.org/show_bug.cgi?id=358589#c8
-
 BuildRequires:  dbusmenu-qt5-devel
 BuildRequires:  extra-cmake-modules >= %{version}
 BuildRequires:  kf5-kcodecs-devel >= %{version}
@@ -30,6 +35,9 @@ BuildRequires:  phonon-qt5-devel
 BuildRequires:  qt5-qtbase-devel
 BuildRequires:  qt5-qttools-devel
 BuildRequires:  qt5-qtx11extras-devel
+%if 0%{?tests}
+BuildRequires: xorg-x11-server-Xvfb dbus-x11
+%endif
 
 Requires:       kf5-filesystem >= %{version}
 
@@ -53,7 +61,8 @@ developing applications that use %{name}.
 %build
 mkdir %{_target_platform}
 pushd %{_target_platform}
-%{cmake_kf5} ..
+%{cmake_kf5} .. \
+  %{?tests:-DBUILD_TESTING:BOOL=ON}
 popd
 
 make %{?_smp_mflags} -C %{_target_platform}
@@ -67,6 +76,14 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 mkdir -p %{buildroot}/%{_kf5_datadir}/knotifications5
 
 
+%check
+%if 0%{?tests}
+export CTEST_OUTPUT_ON_FAILURE=1
+xvfb-run -a dbus-launch --exit-with-session \
+time make test -C %{_target_platform} ARGS="--output-on-failure --timeout 300" ||:
+%endif
+
+
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
@@ -87,6 +104,9 @@ mkdir -p %{buildroot}/%{_kf5_datadir}/knotifications5
 
 
 %changelog
+* Thu Apr 28 2016 Rex Dieter <rdieter@fedoraproject.org> - 5.21.0-2
+- support bootstrap, %%check: enable tests (advisory)
+
 * Mon Apr 04 2016 Rex Dieter <rdieter@fedoraproject.org> - 5.21.0-1
 - KDE Frameworks 5.21.0
 

knotifications-sni_left_click.patch

@@ -1,13 +0,0 @@
-diff --git a/src/kstatusnotifieritem.cpp b/src/kstatusnotifieritem.cpp
-index f9bf460..f9f68a4 100644
---- a/src/kstatusnotifieritem.cpp
-+++ b/src/kstatusnotifieritem.cpp
-@@ -786,6 +786,8 @@ void KStatusNotifierItemPrivate::legacyActivated(QSystemTrayIcon::ActivationReas
- {
-     if (reason == QSystemTrayIcon::MiddleClick) {
-         emit q->secondaryActivateRequested(systemTrayIcon->geometry().topLeft());
-+    } else if (reason == QSystemTrayIcon::Trigger) {
-+        q->activate();
-     }
- }
-