From a6cf8c036f7560fb5761f237b4464d1e29a9783d Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sun, 1 May 2016 05:34:03 -0500 Subject: [PATCH] 16.04.0 --- .gitignore | 4 +--- kf5-syndication.spec | 47 +++++++++++++++++++++++++++++++++----------- sources | 2 +- 3 files changed, 38 insertions(+), 15 deletions(-) diff --git a/.gitignore b/.gitignore index 802765d..4259757 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1 @@ -/syndication-15.12.1.tar.xz -/syndication-15.12.2.tar.xz -/syndication-15.12.3.tar.xz +/syndication-16.04.0.tar.xz diff --git a/kf5-syndication.spec b/kf5-syndication.spec index a5bc301..09ac7b8 100644 --- a/kf5-syndication.spec +++ b/kf5-syndication.spec @@ -1,12 +1,19 @@ %global framework syndication -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 Syndication Library +Summary: The Syndication Library -License: LGPLv2+ and BSD -URL: https://projects.kde.org/%{framework} +License: LGPLv2+ and BSD +URL: https://quickgit.kde.org/?p=%{framework}.git %global revision %(echo %{version} | cut -d. -f3) %if %{revision} >= 50 @@ -16,12 +23,16 @@ 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-kio-devel >= 5.15 BuildRequires: kf5-kcodecs-devel >= 5.15 +BuildRequires: qt5-qtbase-devel +%if 0%{?tests} +BuildRequires: dbus-x11 +BuildRequires: time +BuildRequires: xorg-x11-server-Xvfb +%endif %description %{summary}. @@ -35,13 +46,14 @@ 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} @@ -51,11 +63,21 @@ 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 300" -C %{_target_platform} ||: +%endif + + %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files -%license COPYING.LIB COPYING.BSD +%license COPYING* %{_kf5_libdir}/libKF5Syndication.so.* %files devel @@ -67,6 +89,9 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %changelog +* Sun May 01 2016 Rex Dieter - 16.04.0 -1 +- 16.04.0 + * Tue Mar 15 2016 Rex Dieter - 15.12.3-1 - 15.12.3 diff --git a/sources b/sources index bed49bf..af642c0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7a2301dcd742540f26226dbe2f10032a syndication-15.12.3.tar.xz +90180e413dfa97065f7a627e1b79746e syndication-16.04.0.tar.xz