diff --git a/clutter.spec b/clutter.spec index cba2ce3..008b50b 100644 --- a/clutter.spec +++ b/clutter.spec @@ -6,7 +6,7 @@ Name: clutter Version: 1.16.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Open Source software library for creating rich graphical user interfaces Group: Development/Libraries @@ -18,6 +18,8 @@ Patch0: clutter-1.16.0-fix-evdev-touchpad.patch Patch1: 0001-Bind-constraints-Don-t-force-redraws-on-source-relay.patch Patch2: 0002-Don-t-queue-redraws-when-reallocating-actor-that-hav.patch Patch3: 0001-ClutterStageCogl-Ignore-a-clip-the-size-of-the-stage.patch +# Upstream 3cd9a70fea1ccf795419a1726c7c279b0aaf237e +Patch4: libevdev_deprecated_api.patch BuildRequires: glib2-devel mesa-libGL-devel pkgconfig pango-devel BuildRequires: cairo-gobject-devel gdk-pixbuf2-devel atk-devel @@ -29,6 +31,8 @@ BuildRequires: libXcomposite-devel BuildRequires: libXdamage-devel BuildRequires: libXi-devel BuildRequires: libevdev-devel +# Temporary for autoreconf +BuildRequires: gettext-devel Requires: gobject-introspection %if %{with_wayland} BuildRequires: libgudev1-devel @@ -88,8 +92,12 @@ This package contains documentation for clutter. %patch1 -p1 -b .redraws1 %patch2 -p1 -b .redraws2 %patch3 -p1 -b .redraws3 +%patch4 -p1 -b .evdev_deprecated %build +# needed for patch1, autogen.sh is not enough due to divergent autoconf +# versions at present - adamw 2013/12 +autoreconf -i (if ! test -x configure; then NOCONFIGURE=1 ./autogen.sh; CONFIGFLAGS=--enable-gtk-doc; fi; %configure $CONFIGFLAGS \ --enable-xinput \ @@ -139,6 +147,9 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';' %{_datadir}/gtk-doc/html/cally %changelog +* Thu Dec 26 2013 Adam Williamson - 1.16.2-4 +- backport upstream patch to stop using deprecated libevdev functions + * Mon Dec 9 2013 Matthias Clasen - 1.16.2-3 - A followup fix to the previous changes