From 59f37ae6c78f1b69c2f623cf90ffc0c2b3ea7eda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Wed, 21 Jan 2015 16:19:23 +0100 Subject: [PATCH] Update to 3.15.4 --- .gitignore | 1 + dont-depend-on-unreleased-wayland.patch | 16 ++++++++-------- mutter.spec | 9 ++++++--- sources | 2 +- 4 files changed, 16 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index f477190..115276f 100644 --- a/.gitignore +++ b/.gitignore @@ -82,3 +82,4 @@ mutter-2.31.5.tar.bz2 /mutter-3.15.1.tar.xz /mutter-3.15.2.tar.xz /mutter-3.15.3.tar.xz +/mutter-3.15.4.tar.xz diff --git a/dont-depend-on-unreleased-wayland.patch b/dont-depend-on-unreleased-wayland.patch index b652c24..1dd39df 100644 --- a/dont-depend-on-unreleased-wayland.patch +++ b/dont-depend-on-unreleased-wayland.patch @@ -61,15 +61,15 @@ diff --git a/configure.ac b/configure.ac index a3724d9..65dc031 100644 --- a/configure.ac +++ b/configure.ac -@@ -206,7 +206,7 @@ if test $have_native_backend = yes; then - fi - AM_CONDITIONAL([HAVE_NATIVE_BACKEND],[test $have_native_backend = yes]) +@@ -215,7 +215,7 @@ AS_IF([test "$have_native_backend" = "yes"], [ + ]) + AM_CONDITIONAL([HAVE_NATIVE_BACKEND],[test "$have_native_backend" = "yes"]) --PKG_CHECK_MODULES(MUTTER_WAYLAND, [clutter-wayland-1.0 clutter-wayland-compositor-1.0 wayland-server >= 1.6.90], [have_wayland=yes], [have_wayland=no]) -+PKG_CHECK_MODULES(MUTTER_WAYLAND, [clutter-wayland-1.0 clutter-wayland-compositor-1.0 wayland-server >= 1.5.90], [have_wayland=yes], [have_wayland=no]) - if test $have_wayland = yes; then - AC_PATH_PROG([WAYLAND_SCANNER],[wayland-scanner],[no]) - AS_IF([test $WAYLAND_SCANNER = "no"], +-MUTTER_WAYLAND_MODULES="clutter-wayland-1.0 clutter-wayland-compositor-1.0 wayland-server >= 1.6.90" ++MUTTER_WAYLAND_MODULES="clutter-wayland-1.0 clutter-wayland-compositor-1.0 wayland-server >= 1.5.90" + + AC_ARG_ENABLE(wayland, + AS_HELP_STRING([--disable-wayland], [disable mutter on wayland support]),, -- 2.1.0 diff --git a/mutter.spec b/mutter.spec index bd8d0ae..a57f332 100644 --- a/mutter.spec +++ b/mutter.spec @@ -1,8 +1,8 @@ %global clutter_version 1.19.6-3 Name: mutter -Version: 3.15.3 -Release: 3%{?dist} +Version: 3.15.4 +Release: 1%{?dist} Summary: Window and compositing manager based on Clutter Group: User Interface/Desktops @@ -139,7 +139,7 @@ fi glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : %files -f %{name}.lang -%doc COPYING NEWS doc/theme-format.txt +%doc COPYING NEWS %doc %{_mandir}/man1/mutter.1.gz %{_bindir}/mutter %{_datadir}/applications/*.desktop @@ -165,6 +165,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : %{_datadir}/mutter/tests %changelog +* Wed Jan 21 2015 Florian Müllner - 3.15.4-1 +- Update to 3.15.4 + * Mon Jan 19 2015 Peter Hutterer 3.15.3-3 - Rebuild for libinput soname bump diff --git a/sources b/sources index bcf0aff..cfb7144 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -51e7f24bcd3e87a2335036049e79c561 mutter-3.15.3.tar.xz +8ad4d4cd7251f6da1d9dba60de6d8841 mutter-3.15.4.tar.xz