diff --git a/.gitignore b/.gitignore index 508ac78..a6e8ee3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,16 +1 @@ -/kwindowsystem-5.18.0.tar.xz -/kwindowsystem-5.19.0.tar.xz -/kwindowsystem-5.20.0.tar.xz -/kwindowsystem-5.21.0.tar.xz -/kwindowsystem-5.22.0.tar.xz -/kwindowsystem-5.23.0.tar.xz -/kwindowsystem-5.24.0.tar.xz -/kwindowsystem-5.25.0.tar.xz -/kwindowsystem-5.26.0.tar.xz -/kwindowsystem-5.27.0.tar.xz -/kwindowsystem-5.29.0.tar.xz -/kwindowsystem-5.31.0.tar.xz -/kwindowsystem-5.32.0.tar.xz -/kwindowsystem-5.33.0.tar.xz -/kwindowsystem-5.34.0.tar.xz /kwindowsystem-5.35.0.tar.xz diff --git a/kf5-kwindowsystem.spec b/kf5-kwindowsystem.spec index 37437a4..95472f1 100644 --- a/kf5-kwindowsystem.spec +++ b/kf5-kwindowsystem.spec @@ -1,12 +1,20 @@ %global framework kwindowsystem -Name: kf5-%{framework} +## uncomment to enable bootstrap mode +#global bootstrap 1 + +## currently includes no tests +%if !0%{?bootstrap} +%global tests 1 +%endif + +Name: kf5-%{framework} Version: 5.35.0 Release: 1%{?dist} -Summary: KDE Frameworks 5 Tier 1 integration module with classes for windows management +Summary: KDE Frameworks 5 Tier 1 integration module with classes for windows management -License: LGPLv2+ and MIT -URL: https://cgit.kde.org/%{framework}.git +License: LGPLv2+ and MIT +URL: https://cgit.kde.org/%{framework}.git %global versiondir %(echo %{version} | cut -d. -f1-2) %global revision %(echo %{version} | cut -d. -f3) @@ -15,7 +23,7 @@ URL: https://cgit.kde.org/%{framework}.git %else %global stable stable %endif -Source0: http://download.kde.org/%{stable}/frameworks/%{versiondir}/%{framework}-%{version}.tar.xz +Source0: http://download.kde.org/%{stable}/frameworks/%{versiondir}/%{framework}-%{version}.tar.xz # filter plugin provides %global __provides_exclude_from ^(%{_kf5_plugindir}/.*\\.so)$ @@ -31,6 +39,11 @@ BuildRequires: qt5-qtbase-devel BuildRequires: qt5-qttools-devel BuildRequires: qt5-qtx11extras-devel +%if 0%{?tests} +BuildRequires: weston +BuildRequires: xorg-x11-server-Xvfb +%endif + Requires: kf5-filesystem >= %{version} %description @@ -53,7 +66,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} @@ -61,9 +75,18 @@ make %{?_smp_mflags} -C %{_target_platform} %install make install/fast DESTDIR=%{buildroot} -C %{_target_platform} + %find_lang kwindowsystem5_qt --with-qt --all-name +%check +%if 0%{?tests} +export CTEST_OUTPUT_ON_FAILURE=1 +xvfb-run -a \ +make test ARGS="--output-on-failure --timeout 30" -C %{_target_platform} ||: +%endif + + %post -p /sbin/ldconfig %postun -p /sbin/ldconfig @@ -84,6 +107,9 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %changelog +* Sun Jul 02 2017 Rex Dieter - 5.35.0-2 +- .spec cosmetics, support %%bootstrap,%%check + * Sun Jun 04 2017 Rex Dieter - 5.35.0-1 - 5.35.0