From 7f45be3a617b5f69056d284c1263f0fe42378a87b6a885f8be737587b8b1f3cb Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Fri, 3 Apr 2015 12:07:28 +0000 Subject: [PATCH 1/2] 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 --- mutter.changes | 10 ++++++++++ mutter.spec | 6 +++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/mutter.changes b/mutter.changes index 9c3b95c..372b2fb 100644 --- a/mutter.changes +++ b/mutter.changes @@ -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 diff --git a/mutter.spec b/mutter.spec index 332f6b5..b41ceb8 100644 --- a/mutter.spec +++ b/mutter.spec @@ -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) From a63ee54464cdd3f368d23a8484fd0b55d3a1bd4f5d85e0617e29870fd8c049c8 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Fri, 3 Apr 2015 12:07:46 +0000 Subject: [PATCH 2/2] OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/mutter?expand=0&rev=170 --- mutter.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mutter.changes b/mutter.changes index 372b2fb..893b7c2 100644 --- a/mutter.changes +++ b/mutter.changes @@ -6,7 +6,7 @@ Thu Mar 26 16:58:43 UTC 2015 - dimstar@opensuse.org 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. + originally set, resulting in no change for the build. ------------------------------------------------------------------- Mon Mar 23 20:31:42 UTC 2015 - dimstar@opensuse.org