diff --git a/kf5-kholidays.spec b/kf5-kholidays.spec index 043c1ec..36c2343 100644 --- a/kf5-kholidays.spec +++ b/kf5-kholidays.spec @@ -1,12 +1,19 @@ %global framework kholidays +# uncomment to enable bootstrap mode +#global bootstrap 1 + +%if !0%{?bootstrap} +%global tests 1 +%endif + Name: kf5-%{framework} -Version: 15.12.3 +Version: 16.04.0 Release: 1%{?dist} Summary: The KHolidays Library License: LGPLv2+ and GPLv3+ -URL: https://projects.kde.org/%{framework} +URL: https://quickgit.kde.org/?p=%{framework}.git %global revision %(echo %{version} | cut -d. -f3) %if %{revision} >= 50 @@ -16,13 +23,13 @@ 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: qt5-qttools-static - +BuildRequires: kf5-rpm-macros BuildRequires: kf5-kdelibs4support-devel >= 5.15 BuildRequires: kf5-kitemviews-devel >= 5.15 +BuildRequires: qt5-qtbase-devel +BuildRequires: qt5-qtdeclarative-devel +BuildRequires: qt5-qttools-static %description The KHolidays library provides a C++ API that determines holiday @@ -44,7 +51,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} @@ -54,13 +62,24 @@ 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 20" -C %{_target_platform} ||: +%endif + + %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %license COPYING.LIB %{_kf5_libdir}/libKF5Holidays.so.* -%{_kf5_datadir}/kf5/libkholidays +%{_kf5_datadir}/kf5/libkholidays/ +%{_kf5_qmldir}/org/kde/kholidays/ %files devel %{_kf5_includedir}/kholidays_version.h @@ -71,6 +90,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