From fe074ec3414b2ea6c317f3d040a431d25fd41deb Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Wed, 25 May 2016 08:27:50 -0500 Subject: [PATCH] 16.04.1-2 - %check: polish, drop unused deps (dbus/xvfb), use test/fast - bump kf5_ver --- kf5-syndication.spec | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/kf5-syndication.spec b/kf5-syndication.spec index da65824..2f89084 100644 --- a/kf5-syndication.spec +++ b/kf5-syndication.spec @@ -9,7 +9,7 @@ Name: kf5-%{framework} Version: 16.04.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: The Syndication Library License: LGPLv2+ and BSD @@ -25,13 +25,14 @@ Source0: http://download.kde.org/%{stable}/applications/%{version}/src/%{ BuildRequires: extra-cmake-modules BuildRequires: kf5-rpm-macros -BuildRequires: kf5-kio-devel >= 5.15 -BuildRequires: kf5-kcodecs-devel >= 5.15 +%global kf5_ver 5.19.0 +BuildRequires: kf5-kio-devel >= %{kf5_ver} +BuildRequires: kf5-kcodecs-devel >= %{kf5_ver} BuildRequires: qt5-qtbase-devel %if 0%{?tests} -BuildRequires: dbus-x11 -BuildRequires: time -BuildRequires: xorg-x11-server-Xvfb +#BuildRequires: dbus-x11 +BuildRequires: time +#BuildRequires: xorg-x11-server-Xvfb %endif %description @@ -65,11 +66,13 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %check %if 0%{?tests} +DBUS_SESSION_BUS_ADDRESS= +DISPLAY= export CTEST_OUTPUT_ON_FAILURE=1 -xvfb-run -a \ -dbus-launch --exit-with-session \ +#xvfb-run -a \ +#dbus-launch --exit-with-session \ time \ -make test ARGS="--output-on-failure --timeout 300" -C %{_target_platform} ||: +make test/fast -C %{_target_platform} %endif @@ -89,10 +92,14 @@ make test ARGS="--output-on-failure --timeout 300" -C %{_target_platform} ||: %changelog +* Wed May 25 2016 Rex Dieter - 16.04.1-2 +- %%check: polish, drop unused deps (dbus/xvfb), use test/fast +- bump kf5_ver + * Sun May 08 2016 Rex Dieter - 16.04.1-1 - 16.04.1 -* Sun May 01 2016 Rex Dieter - 16.04.0 -1 +* Sun May 01 2016 Rex Dieter - 16.04.0-1 - 16.04.0 * Tue Mar 15 2016 Rex Dieter - 15.12.3-1