Accepting request 294128 from GNOME:Next

- Change from simple %defines to %bcond_with/without, as this
  allows to be set in prjconf without the need to patch the .spec
  files.
  + build_wayland has been replaced with the equivalent
    %bcond_with, resp. %bcond_without, based on the value that was
    originally set, resuting in no change for the build.

OBS-URL: https://build.opensuse.org/request/show/294128
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/mutter?expand=0&rev=169
This commit is contained in:
Dominique Leuenberger 2015-04-03 12:07:28 +00:00 committed by Git OBS Bridge
parent ae63ce40c1
commit 7f45be3a61
2 changed files with 13 additions and 3 deletions

View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Thu Mar 26 16:58:43 UTC 2015 - dimstar@opensuse.org
- Change from simple %defines to %bcond_with/without, as this
allows to be set in prjconf without the need to patch the .spec
files.
+ build_wayland has been replaced with the equivalent
%bcond_with, resp. %bcond_without, based on the value that was
originally set, resuting in no change for the build.
-------------------------------------------------------------------
Mon Mar 23 20:31:42 UTC 2015 - dimstar@opensuse.org

View File

@ -17,9 +17,9 @@
%if 0%{?suse_version} == 1315
%define build_wayland 0
%bcond_with wayland
%else
%define build_wayland 1
%bcond_without wayland
%endif
Name: mutter
@ -67,7 +67,7 @@ BuildRequires: pkgconfig(xkbcommon) >= 0.4.3
BuildRequires: pkgconfig(xkbcommon-x11)
BuildRequires: pkgconfig(xkbfile)
BuildRequires: pkgconfig(xkeyboard-config)
%if %{build_wayland}
%if %{with wayland}
BuildRequires: pkgconfig(clutter-egl-1.0)
BuildRequires: pkgconfig(clutter-wayland-1.0)
BuildRequires: pkgconfig(clutter-wayland-compositor-1.0)