From e9cdc1acf46f71f54d914e7803713fbb4b887e16 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: May 01 2016 20:09:01 +0000 Subject: 16.04.0, update URL, support bootstrap, add %check --- diff --git a/.gitignore b/.gitignore index 5237967..41554a1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1 @@ -/kalarmcal-15.12.1.tar.xz -/kalarmcal-15.12.2.tar.xz -/kalarmcal-15.12.3.tar.xz +/kalarmcal-16.04.0.tar.xz diff --git a/kf5-kalarmcal.spec b/kf5-kalarmcal.spec index 862ee85..61c7a50 100644 --- a/kf5-kalarmcal.spec +++ b/kf5-kalarmcal.spec @@ -1,12 +1,19 @@ %global framework kalarmcal -Name: kf5-%{framework} -Version: 15.12.3 +# uncomment to enable bootstrap mode +#global bootstrap 1 + +%if !0%{?bootstrap} +%global tests 1 +%endif + +Name: kf5-%{framework} +Version: 16.04.0 Release: 1%{?dist} -Summary: The KAlarmCal Library +Summary: The KAlarmCal Library -License: LGPLv2+ -URL: https://projects.kde.org/%{framework} +License: LGPLv2+ +URL: https://quickgit.kde.org/?p=%{framework}.git %global revision %(echo %{version} | cut -d. -f3) %if %{revision} >= 50 @@ -16,17 +23,20 @@ URL: https://projects.kde.org/%{framework} %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: kf5-rpm-macros BuildRequires: kf5-kdelibs4support-devel >= 5.15 - %global majmin_ver %(echo %{version} | cut -d. -f1,2) BuildRequires: kf5-akonadi-devel >= %{majmin_ver} BuildRequires: kf5-kcalendarcore-devel >= %{majmin_ver} BuildRequires: kf5-kidentitymanagement-devel >= %{majmin_ver} BuildRequires: kf5-kholidays-devel >= %{majmin_ver} +BuildRequires: qt5-qtbase-devel +%if 0%{?tests} +BuildRequires: dbus-x11 +BuildRequires: time +BuildRequires: xorg-x11-server-Xvfb +%endif %description %{summary}. @@ -39,20 +49,20 @@ Requires: kf5-akonadi-devel Requires: kf5-kidentitymanagement-devel Requires: kf5-kholidays-devel Requires: kf5-kcalendarcore-devel - %description devel The %{name}-devel package contains libraries and header files for developing applications that use %{name}. %prep -%setup -q -n %{framework}-%{version} +%autosetup -n %{framework}-%{version} -p1 %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} @@ -62,6 +72,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 10" -C %{_target_platform} ||: +%endif + + %post -p /sbin/ldconfig %postun -p /sbin/ldconfig @@ -79,6 +99,9 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %changelog +* Sun May 01 2016 Rex Dieter - 16.04.0-1 +- 16.04.0, update URL, support bootstrap, add %%check + * Tue Mar 15 2016 Rex Dieter - 15.12.3-1 - 15.12.3 diff --git a/sources b/sources index 71e0d81..ce669b3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -af0abd4d1861e15c6282fb0ed1d7ecf1 kalarmcal-15.12.3.tar.xz +bf6af8978c99b15677107284a45d3a2e kalarmcal-16.04.0.tar.xz