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 + +- 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 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