From 1b8934ce281dfd47b65d3d74749f0cea9e45336b Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 26 Dec 2016 20:45:54 -0600 Subject: [PATCH] 16.12.0, support bootstrap, %check: enable tests --- .gitignore | 1 + dolphin.spec | 32 ++++++++++++++++++++++++++------ sources | 2 +- 3 files changed, 28 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index f6a095d..e137ede 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /dolphin-16.08.1.tar.xz /dolphin-16.08.2.tar.xz /dolphin-16.08.3.tar.xz +/dolphin-16.12.0.tar.xz diff --git a/dolphin.spec b/dolphin.spec index 98bc5eb..87c9c03 100644 --- a/dolphin.spec +++ b/dolphin.spec @@ -1,11 +1,20 @@ + +# uncomment to enable bootstrap mode +#global bootstrap 1 + +%if !0%{?bootstrap} +%global tests 1 +%endif + Name: dolphin Summary: KDE File Manager -Version: 16.08.3 +Version: 16.12.0 Release: 1%{?dist} License: GPLv2+ URL: https://quickgit.kde.org/?p=%{name}.git %global revision %(echo %{version} | cut -d. -f3) +%global majmin_ver %(echo %{version} | cut -d. -f1,2) %if %{revision} >= 50 %global stable unstable %else @@ -35,16 +44,16 @@ BuildRequires: kf5-kcompletion-devel BuildRequires: kf5-ktexteditor-devel BuildRequires: kf5-kwindowsystem-devel BuildRequires: kf5-knotifications-devel -BuildRequires: kf5-kactivities-devel +%if ! 0%{?bootstrap} +BuildRequires: kf5-kactivities-devel BuildRequires: kf5-baloo-devel BuildRequires: kf5-kfilemetadata-devel +BuildRequires: baloo-widgets-devel >= %{majmin_ver} +%endif BuildRequires: phonon-qt5-devel -%global majmin_ver %(echo %{version} | cut -d. -f1,2) -BuildRequires: baloo-widgets-devel >= %{majmin_ver} - BuildRequires: libappstream-glib Requires: %{name}-libs%{?_isa} = %{version}-%{release} @@ -76,7 +85,8 @@ Requires: kf5-kio-devel%{?_isa} %build mkdir %{_target_platform} pushd %{_target_platform} -%{cmake_kf5} .. +%{cmake_kf5} .. \ + -DBUILD_TESTING:BOOL=%{?tests:ON}%{!?tests:OFF} popd make %{?_smp_mflags} -C %{_target_platform} @@ -89,6 +99,13 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %check appstream-util validate-relax --nonet %{buildroot}%{_kf5_datadir}/appdata/org.kde.%{name}.appdata.xml ||: desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/org.kde.%{name}.desktop ||: +%if 0%{?tests} +export CTEST_OUTPUT_ON_FAILURE=1 +#dbus-launch --exit-with-session \ +xvfb-run -a \ +make test ARGS="--output-on-failure --timeout 10" -C %{_target_platform} ||: +%endif + %posttrans @@ -136,6 +153,9 @@ fi %changelog +* Mon Dec 26 2016 Rex Dieter - 16.12.0-1 +- 16.12.0, support bootstrap, %%check: enable tests + * Wed Nov 30 2016 Rex Dieter - 16.08.3-1 - 16.08.3 diff --git a/sources b/sources index 80778b5..c74eb3e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2fbeb00ac4d09f9d506aea231b077787 dolphin-16.08.3.tar.xz +SHA512 (dolphin-16.12.0.tar.xz) = 8c1da4517bac50f4bd085baa23e204201159e09a4842d160402a1cc29301f726a04bc3283cd0ef9e7ca3a7c0305adeb77b5548ac0b2b1eed8098faf131e908d5