From 51ab300f254d194853a5a6f449a8120451395fa8 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Fri, 11 Jul 2014 11:56:16 +0100 Subject: [PATCH] Enable make check, Build installed tests (thanks Vadim Rutkovsky) RHBZ 1117375, Drop old obsoletes --- clutter.spec | 45 +++++++++++++++++++++++++++++++-------------- 1 file changed, 31 insertions(+), 14 deletions(-) diff --git a/clutter.spec b/clutter.spec index 4e62a8e..8b0acc8 100644 --- a/clutter.spec +++ b/clutter.spec @@ -4,9 +4,11 @@ %global with_wayland 1 %endif +%global with_tests 1 + Name: clutter Version: 1.19.4 -Release: 1%{?dist} +Release: 3%{?dist} Summary: Open Source software library for creating rich graphical user interfaces Group: Development/Libraries @@ -36,18 +38,6 @@ BuildRequires: libxkbcommon-devel Requires: gobject-introspection -# F18 -Obsoletes: clutter-gtk010 < 0.11.4-9 -Obsoletes: clutter-gtk010-devel < 0.11.4-9 -Obsoletes: clutter-sharp < 0-0.17 -Obsoletes: clutter-sharp-devel < 0-0.17 -Obsoletes: pyclutter < 1.3.2-13 -Obsoletes: pyclutter-devel < 1.3.2-13 -Obsoletes: pyclutter-gst < 1.0.0-10 -Obsoletes: pyclutter-gst-devel < 1.0.0-10 -Obsoletes: pyclutter-gtk < 0.10.0-14 -Obsoletes: pyclutter-gtk-devel < 0.10.0-14 - %description Clutter is an open source software library for creating fast, visually rich graphical user interfaces. The most obvious example @@ -76,6 +66,17 @@ We hope however it can be used for a lot more. This package contains documentation for clutter. +%if 0%{?with_tests} +%package tests +Summary: Tests for the clutter package +Group: Development/Libraries +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description tests +The clutter-tests package contains tests that can be used to verify +the functionality of the installed clutter package. +%endif + %prep %setup -q @@ -83,6 +84,8 @@ This package contains documentation for clutter. %configure \ --enable-xinput \ --enable-gdk-backend \ + --enable-installed-tests \ + %{?with_tests:--enable-installed-tests} \ %if %{with_wayland} --enable-egl-backend \ --enable-evdev-input \ @@ -96,10 +99,13 @@ make %{?_smp_mflags} V=1 make install DESTDIR=%{buildroot} INSTALL='install -p' #Remove libtool archives. -find %{buildroot} -name '*.la' -exec rm -f {} ';' +find %{buildroot} -name '*.la' -delete %find_lang clutter-1.0 +%check +make check %{?_smp_mflags} V=1 + %post -p /sbin/ldconfig %postun -p /sbin/ldconfig @@ -120,7 +126,18 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';' %{_datadir}/gtk-doc/html/clutter %{_datadir}/gtk-doc/html/cally +%if 0%{?with_tests} +%files tests +%{_libexecdir}/installed-tests/clutter +%{_datadir}/installed-tests +%endif + %changelog +* Fri Jul 11 2014 Peter Robinson 1.19.4-2 +- Enable make check +- Build installed tests (thanks Vadim Rutkovsky) RHBZ 1117375 +- Drop old obsoletes + * Wed Jun 25 2014 Richard Hughes - 1.19.4-1 - Update to 1.19.4