From 295c7e3ea7afc0eb5f560c4c3a5cf725fddfc819 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: May 01 2016 20:49:05 +0000 Subject: 16.04.0, support bootstrap, add %check --- diff --git a/.gitignore b/.gitignore index 6c9d262..c6d3958 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1 @@ -/akonadi-search-15.12.1.tar.xz -/akonadi-search-15.12.2.tar.xz -/akonadi-search-15.12.3.tar.xz +/akonadi-search-16.04.0.tar.xz diff --git a/kf5-akonadi-search.spec b/kf5-akonadi-search.spec index 70cdbd4..808fb74 100644 --- a/kf5-akonadi-search.spec +++ b/kf5-akonadi-search.spec @@ -1,8 +1,15 @@ %global framework akonadi-search +# uncomment to enable bootstrap mode +#global bootstrap 1 + +%if !0%{?bootstrap} +%global tests 1 +%endif + Name: kf5-%{framework} -Version: 15.12.3 -Release: 2%{?dist} +Version: 16.04.0 +Release: 1%{?dist} Summary: The Akonadi Search library and indexing agent License: LGPLv2+ @@ -16,23 +23,25 @@ URL: https://quickgit.kde.org/?p=%{framework}.git %endif Source0: http://download.kde.org/%{stable}/applications/%{version}/src/%{framework}-%{version}.tar.xz -BuildRequires: kf5-rpm-macros BuildRequires: extra-cmake-modules -BuildRequires: qt5-qtbase-devel - -BuildRequires: xapian-core-devel - +BuildRequires: kf5-rpm-macros BuildRequires: kf5-ki18n-devel >= 5.15 BuildRequires: kf5-kconfig-devel >= 5.15 BuildRequires: kf5-kcrash-devel >= 5.15 BuildRequires: kf5-krunner-devel >= 5.15 BuildRequires: kf5-kcmutils-devel >= 5.15 - %global majmin_ver %(echo %{version} | cut -d. -f1,2) BuildRequires: kf5-akonadi-mime-devel >= %{majmin_ver} BuildRequires: kf5-kcontacts-devel >= %{majmin_ver} BuildRequires: kf5-kcalendarcore-devel >= %{majmin_ver} BuildRequires: kf5-kmime-devel >= %{majmin_ver} +BuildRequires: qt5-qtbase-devel +BuildRequires: xapian-core-devel +%if 0%{?tests} +BuildRequires: dbus-x11 +BuildRequires: time +BuildRequires: xorg-x11-server-Xvfb +%endif %description %{summary}. @@ -60,7 +69,8 @@ developing applications that use %{name}. %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} @@ -70,6 +80,16 @@ make %{?_smp_mflags} -C %{_target_platform} make install/fast DESTDIR=%{buildroot} -C %{_target_platform} +%check +%if 0%{?tests} +export CTEST_OUTPUT_ON_FAILURE=1 +xvfb-run -a \ +dbus-launch --exit-with-session \ +time \ +make test ARGS="--output-on-failure --timeout 30" -C %{_target_platform} ||: +%endif + + %post -p /sbin/ldconfig %postun -p /sbin/ldconfig @@ -100,6 +120,9 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %changelog +* Sun May 01 2016 Rex Dieter - 16.04.0-1 +- 16.04.0, support bootstrap, add %%check + * Sat Apr 30 2016 Rex Dieter - 15.12.3-2 - update URL - own %%{_kf5_qtplugindir}/akonadi/ diff --git a/sources b/sources index f1bda81..3d5e78b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d49da2a43500d6f3fb7dc4fbad74749e akonadi-search-15.12.3.tar.xz +27539d0daa7d1feca42d473130e49a2f akonadi-search-16.04.0.tar.xz