From 0c5aa02508353789de27e6ced1064a18e6f2f0d5c1f55a911ee79d759aa00d9d Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Fri, 15 Sep 2017 09:31:16 +0000 Subject: [PATCH] Accepting request 526292 from home:zhangxiaofei:branches:GNOME:Factory - Drop SLE12 / Leap42 conditionals and build with wayland unconditionally. OBS-URL: https://build.opensuse.org/request/show/526292 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/mutter?expand=0&rev=254 --- mutter.changes | 6 ++++++ mutter.spec | 12 ------------ 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/mutter.changes b/mutter.changes index a5d8d5d..facc370 100644 --- a/mutter.changes +++ b/mutter.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Sep 14 14:39:13 UTC 2017 - fezhang@suse.com + +- Drop SLE12 / Leap42 conditionals and build with wayland + unconditionally. + ------------------------------------------------------------------- Tue Sep 12 19:33:28 UTC 2017 - luc14n0@linuxmail.org diff --git a/mutter.spec b/mutter.spec index f8c85d8..fdbe878 100644 --- a/mutter.spec +++ b/mutter.spec @@ -16,11 +16,6 @@ # -%if 0%{?suse_version} == 1315 -%bcond_with wayland -%else -%bcond_without wayland -%endif Name: mutter Version: 3.26.0 Release: 0 @@ -87,14 +82,12 @@ Obsoletes: typelib-1_0-Meta-3_0 %if !0%{?is_opensuse} BuildRequires: translation-update-upstream %endif -%if %{with wayland} BuildRequires: pkgconfig(gbm) >= 10.3 BuildRequires: pkgconfig(gudev-1.0) >= 232 BuildRequires: pkgconfig(libdrm) BuildRequires: pkgconfig(libsystemd) BuildRequires: pkgconfig(wayland-protocols) >= 1.9 BuildRequires: pkgconfig(wayland-server) >= 1.13.0 -%endif %description Mutter is a window and compositing manager based on Clutter, forked @@ -152,13 +145,8 @@ translation-update-upstream %build %configure \ -%if %{with wayland} --enable-wayland \ --enable-native-backend \ -%else - --disable-wayland \ - --disable-native-backend \ -%endif --disable-static \ --enable-egl-device \ --enable-compile-warnings=maximum