From 239e48c7e2acd97e2e26e33c9a6e62f86d30d979f86abc0baa083b077c5bafed Mon Sep 17 00:00:00 2001
From: Stefan Dirsch <sndirsch@suse.com>
Date: Thu, 15 Feb 2024 11:48:50 +0000
Subject: [PATCH 1/2] Accepting request 1146791 from
 home:jtorres:branches:X11:XOrg

- Provide xorg-x11-server-source from xwayland
  * xwayland will be more updated than xorg-x11-server, so the server sources
    will be more updated too if are provided by xwayland.
  * Fixes bsc#1219892.

OBS-URL: https://build.opensuse.org/request/show/1146791
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xwayland?expand=0&rev=72
---
 xwayland.changes |  8 ++++++++
 xwayland.spec    | 21 +++++++++++++++++++++
 2 files changed, 29 insertions(+)

diff --git a/xwayland.changes b/xwayland.changes
index cdb10ca..c0e1b8b 100644
--- a/xwayland.changes
+++ b/xwayland.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Thu Feb 15 10:41:13 UTC 2024 - Joan Torres <joan.torres@suse.com>
+
+- Provide xorg-x11-server-source from xwayland
+  * xwayland will be more updated than xorg-x11-server, so the server sources 
+    will be more updated too if are provided by xwayland.
+  * Fixes bsc#1219892.
+
 -------------------------------------------------------------------
 Wed Jan 17 10:20:50 UTC 2024 - Stefan Dirsch <sndirsch@suse.com>
 
diff --git a/xwayland.spec b/xwayland.spec
index 661441c..3c39c12 100644
--- a/xwayland.spec
+++ b/xwayland.spec
@@ -125,10 +125,22 @@ Requires:       pkgconfig(xv)
 %description devel
 This package contains the Xwayland Server development files.
 
+%package -n xorg-x11-server-source
+Summary:        Source code of X.Org server
+Group:          Development/Sources
+
+%description -n xorg-x11-server-source
+This package contains patched sources of X.Org Server.
+
 %prep
 %autosetup -p1
 
 %build
+
+test -e source-file-list || \
+   find -L . -type f ! -path './.*' ! -name '.*' ! -name '*.orig' ! -name source-file-list > \
+   source-file-list
+
 %{meson} \
    -Dglamor=true \
 %if 0%{?have_wayland_eglstream} == 1
@@ -181,6 +193,11 @@ rm -f %{buildroot}%{_mandir}/man1/Xserver.1
 # Provided by xorg-x11-server
 rm -f %{buildroot}%{_libdir}/xorg/protocol.txt
 
+mkdir -p %{buildroot}%{_usrsrc}/xserver
+xargs cp --parents --target-directory=%{buildroot}%{_usrsrc}/xserver < source-file-list
+# unneeded python2 script; simply remove it (boo#1179591)
+rm -f %{buildroot}%{_usrsrc}/xserver/config/fdi2iclass.py
+
 %files
 %{_bindir}/Xwayland
 %{_mandir}/man1/Xwayland.1%{ext_man}
@@ -190,4 +207,8 @@ rm -f %{buildroot}%{_libdir}/xorg/protocol.txt
 %{_libdir}/pkgconfig/*.pc
 %dir %{_libdir}/xorg
 
+%files -n xorg-x11-server-source
+%defattr(-,root,root)
+%{_usrsrc}/xserver
+
 %changelog

From 9c2dfa035c81c3fd45b868a95cdbf54f90ba513298c0b5d822aad74c57bb1204 Mon Sep 17 00:00:00 2001
From: Stefan Dirsch <sndirsch@suse.com>
Date: Thu, 15 Feb 2024 18:36:04 +0000
Subject: [PATCH 2/2] Accepting request 1146917 from
 home:jtorres:branches:X11:XOrg

- Don't provide xorg-x11-server-source
  * xwayland sources are not meant for a generic server.
  * https://github.com/TigerVNC/tigervnc/issues/1728

OBS-URL: https://build.opensuse.org/request/show/1146917
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xwayland?expand=0&rev=73
---
 xwayland.changes |  7 +++++++
 xwayland.spec    | 21 ---------------------
 2 files changed, 7 insertions(+), 21 deletions(-)

diff --git a/xwayland.changes b/xwayland.changes
index c0e1b8b..35930b9 100644
--- a/xwayland.changes
+++ b/xwayland.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Feb 15 17:13:03 UTC 2024 - Joan Torres <joan.torres@suse.com>
+
+- Don't provide xorg-x11-server-source
+  * xwayland sources are not meant for a generic server.
+  * https://github.com/TigerVNC/tigervnc/issues/1728
+
 -------------------------------------------------------------------
 Thu Feb 15 10:41:13 UTC 2024 - Joan Torres <joan.torres@suse.com>
 
diff --git a/xwayland.spec b/xwayland.spec
index 3c39c12..661441c 100644
--- a/xwayland.spec
+++ b/xwayland.spec
@@ -125,22 +125,10 @@ Requires:       pkgconfig(xv)
 %description devel
 This package contains the Xwayland Server development files.
 
-%package -n xorg-x11-server-source
-Summary:        Source code of X.Org server
-Group:          Development/Sources
-
-%description -n xorg-x11-server-source
-This package contains patched sources of X.Org Server.
-
 %prep
 %autosetup -p1
 
 %build
-
-test -e source-file-list || \
-   find -L . -type f ! -path './.*' ! -name '.*' ! -name '*.orig' ! -name source-file-list > \
-   source-file-list
-
 %{meson} \
    -Dglamor=true \
 %if 0%{?have_wayland_eglstream} == 1
@@ -193,11 +181,6 @@ rm -f %{buildroot}%{_mandir}/man1/Xserver.1
 # Provided by xorg-x11-server
 rm -f %{buildroot}%{_libdir}/xorg/protocol.txt
 
-mkdir -p %{buildroot}%{_usrsrc}/xserver
-xargs cp --parents --target-directory=%{buildroot}%{_usrsrc}/xserver < source-file-list
-# unneeded python2 script; simply remove it (boo#1179591)
-rm -f %{buildroot}%{_usrsrc}/xserver/config/fdi2iclass.py
-
 %files
 %{_bindir}/Xwayland
 %{_mandir}/man1/Xwayland.1%{ext_man}
@@ -207,8 +190,4 @@ rm -f %{buildroot}%{_usrsrc}/xserver/config/fdi2iclass.py
 %{_libdir}/pkgconfig/*.pc
 %dir %{_libdir}/xorg
 
-%files -n xorg-x11-server-source
-%defattr(-,root,root)
-%{_usrsrc}/xserver
-
 %changelog