.gitignore

@@ -1 +1 @@
-SOURCES/xwayland-22.1.9.tar.xz
+SOURCES/xwayland-23.2.7.tar.xz

.xorg-x11-server-Xwayland.metadata

@@ -1 +1 @@
-19ccc8ae5920620db725a08ee65d8b64c521d766 SOURCES/xwayland-22.1.9.tar.xz
+0dd118bd1d816c0407ab2c67971f70ec55f4b73c SOURCES/xwayland-23.2.7.tar.xz

SPECS/xorg-x11-server-Xwayland.spec

@@ -8,8 +8,8 @@
 
 Summary:   Xwayland
 Name:      xorg-x11-server-Xwayland
-Version:   22.1.9
+Version:   23.2.7
-Release:   2%{?gitdate:.%{gitdate}git%{shortcommit}}%{?dist}
+Release:   1%{?gitdate:.%{gitdate}git%{shortcommit}}%{?dist}
 
 URL:       http://www.x.org
 %if 0%{?gitdate}
@@ -22,19 +22,22 @@ License:   MIT
 
 Requires: xorg-x11-server-common
 Requires: libEGL
+Requires: libepoxy >= 1.5.5
 
 BuildRequires: gcc
 BuildRequires: git-core
 BuildRequires: meson
 
 BuildRequires: wayland-devel
-BuildRequires: pkgconfig(wayland-client) >= 1.18.0
+BuildRequires: desktop-file-utils
-BuildRequires: pkgconfig(wayland-protocols)
+
+BuildRequires: pkgconfig(wayland-client) >= 1.21.0
+BuildRequires: pkgconfig(wayland-protocols) >= 1.30
 BuildRequires: pkgconfig(wayland-eglstream-protocols)
 
-BuildRequires: pkgconfig(epoxy)
+BuildRequires: pkgconfig(epoxy) >= 1.5.5
 BuildRequires: pkgconfig(fontenc)
-BuildRequires: pkgconfig(libdrm) >= 2.4.0
+BuildRequires: pkgconfig(libdrm) >= 2.4.89
 BuildRequires: pkgconfig(libssl)
 BuildRequires: pkgconfig(libtirpc)
 BuildRequires: pkgconfig(pixman-1)
@@ -57,7 +60,8 @@ BuildRequires: pkgconfig(xtrans) >= 1.3.2
 BuildRequires: pkgconfig(xtst)
 BuildRequires: pkgconfig(xv)
 BuildRequires: pkgconfig(libxcvt)
-BuildRequires: xorg-x11-proto-devel >= 7.7-10
+BuildRequires: pkgconfig(libdecor-0) >= 0.1.1
+BuildRequires: xorg-x11-proto-devel >= 2023.2-1
 
 BuildRequires: mesa-libGL-devel >= 9.2
 BuildRequires: mesa-libEGL-devel
@@ -85,6 +89,7 @@ Xwayland is an X server for running X clients under Wayland.
 %package devel
 Summary: Development package
 Requires: pkgconfig
+Requires: %{name}%{?_isa} = %{version}-%{release}
 
 %description devel
 The development package provides the developmental files which are
@@ -99,6 +104,7 @@ necessary for developing Wayland compositors using Xwayland.
         -Ddefault_font_path=%{default_font_path} \
         -Dbuilder_string="Build ID: %{name} %{version}-%{release}" \
         -Dxkb_output_dir=%{_localstatedir}/lib/xkb \
+        -Dserverconfigdir=%{_datadir}/xwayland \
         -Dxcsecurity=true \
         -Dglamor=true \
         -Ddri3=true
@@ -115,17 +121,45 @@ rm -Rf $RPM_BUILD_ROOT%{_includedir}/xorg
 rm -Rf $RPM_BUILD_ROOT%{_datadir}/aclocal
 rm -Rf $RPM_BUILD_ROOT%{_localstatedir}/lib/xkb
 
+%check
+desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
+
 %files
+%dir %{_datadir}/xwayland
 %{_bindir}/Xwayland
 %{_mandir}/man1/Xwayland.1*
+%{_datadir}/applications/org.freedesktop.Xwayland.desktop
+%{_datadir}/xwayland/protocol.txt
 
 %files devel
 %{_libdir}/pkgconfig/xwayland.pc
 
 %changelog
+* Thu May 16 2024 Olivier Fourdan <ofourdan@redhat.com> - 23.2.7-1
+- xwayland 23.2.7 - (RHEL-29912)
+
+* Thu Apr  4 2024 Olivier Fourdan <ofourdan@redhat.com> - 21.1.9-7
+- CVE fix for: CVE-2024-31080, CVE-2024-31081, CVE-2024-31083
+
+* Wed Mar 13 2024 Olivier Fourdan <ofourdan@redhat.com> - 21.1.9-6
+  New build to add xorg-x11-server-Xwayland-devel (RHEL-25083)
+
+* Tue Jan 16 2024 Olivier Fourdan <ofourdan@redhat.com> - 21.1.9-5
+  Fix for CVE-2023-6816, CVE-2024-0229, CVE-2024-21885, CVE-2024-21886,
+  CVE-2024-0408, CVE-2024-0409
+
+* Wed Dec 13 2023 Olivier Fourdan <ofourdan@redhat.com> - 21.1.9-4
+- Fix for CVE-2023-6377, CVE-2023-6478
+
+* Wed Oct 25 2023 Olivier Fourdan <ofourdan@redhat.com> - 22.1.9-3
+- Fix for CVE-2023-5367
+
 * Tue Apr 25 2023 Olivier Fourdan <ofourdan@redhat.com> - 22.1.9-2
 - Rebuild (#2158761)
 
+* Fri Apr 14 2023 MSVSphere Packaging Team <packager@msvsphere.ru> - 22.1.9-1
+- Rebuilt for MSVSphere 9.2 beta
+
 * Mon Apr  3 2023 Olivier Fourdan <ofourdan@redhat.com> - 22.1.9-1
 - xwayland 22.1.9 (#2158761)