From 41c9df058ab01414905459f1d7d67a2abe68e39de5158e6ed8fc20900971ed1e Mon Sep 17 00:00:00 2001
From: Egbert Eich <eich@suse.com>
Date: Fri, 8 Jan 2016 17:47:40 +0000
Subject: [PATCH 1/3] - Split out Xwayland:   * Build a package
 xorg-x11-server-wayland   * Limit build to Factory.

OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-server?expand=0&rev=598
---
 xorg-x11-server.changes |  7 +++++++
 xorg-x11-server.spec    | 24 +++++++++++++++++++-----
 2 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/xorg-x11-server.changes b/xorg-x11-server.changes
index 82e3c14..6e4fb54 100644
--- a/xorg-x11-server.changes
+++ b/xorg-x11-server.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Jan  8 17:42:18 UTC 2016 - eich@suse.com
+
+- Split out Xwayland:
+  * Build a package xorg-x11-server-wayland
+  * Limit build to Factory.
+
 -------------------------------------------------------------------
 Sat Jan  2 18:47:27 UTC 2016 - hrvoje.senjan@gmail.com
 
diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index f26fb91..56e741e 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package xorg-x11-server
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -19,7 +19,7 @@
 %ifarch s390 s390x
 %define have_wayland 0
 %else
-%if 0%{?suse_version} >= 1320 || 0%{?is_opensuse}
+%if 0%{?suse_version} >= 1330
 %define have_wayland 1
 %endif
 %endif
@@ -205,6 +205,18 @@ Obsoletes:      xorg-x11-Xnest
 %description extra
 This package contains additional Xservers (Xdmx, Xephyr, Xnest).
 
+%if 0%{?have_wayland} == 1
+%package wayland
+Summary:        Xwayland Xserver
+Group:          System/X11/Servers/XF86_4
+Requires:       xkbcomp
+Requires:       xkeyboard-config
+Requires:       xorg-x11-fonts-core
+
+%description wayland
+This package contains the Xserver running on the Wayland Display Server.
+%endif
+
 %package sdk
 Summary:        X
 Group:          System/Libraries
@@ -475,12 +487,14 @@ fi
 %ghost %{_sysconfdir}/alternatives/libglx.so
 %endif
 %endif
-%if 0%{?have_wayland} == 1
-%{_bindir}/Xwayland
-%endif
 %{_bindir}/Xvfb
 %{_bindir}/xorg-backtrace
 
+%if 0%{?have_wayland} == 1
+%files wayland
+%{_bindir}/Xwayland
+%endif
+
 %files extra
 %defattr(-,root,root)
 %{_bindir}/Xephyr

From ca043642eee716250d5fab64bf9aa7008ca578d71e2fb8fcf02ea3512e2131d1 Mon Sep 17 00:00:00 2001
From: Egbert Eich <eich@suse.com>
Date: Sat, 9 Jan 2016 12:55:21 +0000
Subject: [PATCH 2/3] Updated Changelog:   * Limit build to Factory
 (boo#960487).

OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-server?expand=0&rev=599
---
 xorg-x11-server.changes | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xorg-x11-server.changes b/xorg-x11-server.changes
index 6e4fb54..ac4a0ab 100644
--- a/xorg-x11-server.changes
+++ b/xorg-x11-server.changes
@@ -3,7 +3,7 @@ Fri Jan  8 17:42:18 UTC 2016 - eich@suse.com
 
 - Split out Xwayland:
   * Build a package xorg-x11-server-wayland
-  * Limit build to Factory.
+  * Limit build to Factory (boo#960487).
 
 -------------------------------------------------------------------
 Sat Jan  2 18:47:27 UTC 2016 - hrvoje.senjan@gmail.com

From 97c485a17d60be9b45546fac5678db7b6169354ab18d27e414669a27ffd928f7 Mon Sep 17 00:00:00 2001
From: Egbert Eich <eich@suse.com>
Date: Sun, 10 Jan 2016 19:01:24 +0000
Subject: [PATCH 3/3] - Add test for defined macro %build_xwayland   This can
 be used to enable the build of Xwayland and the   package
 xorg-x11-server-wayland using a macro in projconf   (boo#960487).

OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-server?expand=0&rev=600
---
 xorg-x11-server.changes | 8 ++++++++
 xorg-x11-server.spec    | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/xorg-x11-server.changes b/xorg-x11-server.changes
index ac4a0ab..2b550a4 100644
--- a/xorg-x11-server.changes
+++ b/xorg-x11-server.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Sun Jan 10 18:59:29 UTC 2016 - eich@suse.com
+
+- Add test for defined macro %build_xwayland
+  This can be used to enable the build of Xwayland and the
+  package xorg-x11-server-wayland using a macro in projconf
+  (boo#960487).
+
 -------------------------------------------------------------------
 Fri Jan  8 17:42:18 UTC 2016 - eich@suse.com
 
diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index 56e741e..492db15 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -19,7 +19,7 @@
 %ifarch s390 s390x
 %define have_wayland 0
 %else
-%if 0%{?suse_version} >= 1330
+%if 0%{?suse_version} >= 1330 || 0%{?build_xwayland}
 %define have_wayland 1
 %endif
 %endif