diff --git a/xorg-x11-server.changes b/xorg-x11-server.changes index 61e0c5a..6276149 100644 --- a/xorg-x11-server.changes +++ b/xorg-x11-server.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Feb 15 10:46:29 UTC 2024 - Joan Torres + +- Stop providing xorg-x11-server-source from xorg-x11-server + * Now the sources are provided by xwayland because it is more updated. + * Fixes bsc#1219892. + ------------------------------------------------------------------- Mon Feb 12 09:58:50 UTC 2024 - Stefan Dirsch diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index e84a07c..4073ce0 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -146,7 +146,7 @@ Requires: libpixman-1-0 >= 0.24 Requires: Mesa %if 0%{?suse_version} >= 1315 Requires(post): update-alternatives -Requires(postun):update-alternatives +Requires(postun): update-alternatives %endif Provides: xorg-x11-server-glx Obsoletes: xorg-x11-server-glx @@ -336,13 +336,6 @@ Obsoletes: xorg-x11-server-sdk < 7.6_%{version} %description sdk This package contains the X.Org Server SDK. -%package source -Summary: Source code of X.Org server -Group: Development/Sources - -%description source -This package contains patched sources of X.Org Server. - %prep %setup -q -n xorg-server-%{version} -a3 # Early verification if the ABI Defines are correct. Let's not waste build cycles if the Provides are wrong at the end. @@ -407,10 +400,6 @@ sh %{SOURCE92} --verify . %{SOURCE91} export SUSE_ZNOW=0 %global _lto_cflags %{?_lto_cflags} -ffat-lto-objects -test -e source-file-list || \ - find -L . -type f \! -name '*.orig' \! -path ./source-file-list > \ - source-file-list - autoreconf -fi %if 0%{?pci_ids_dir:1} export PCI_TXT_IDS_DIR=%{pci_ids_dir} @@ -514,11 +503,6 @@ mv %{buildroot}%{_libdir}/xorg/modules/extensions/libglx.so \ ln -snf %{_sysconfdir}/alternatives/libglx.so %{buildroot}%{_libdir}/xorg/modules/extensions/libglx.so %endif -mkdir -p %{buildroot}/usr/src/xserver -xargs cp --parents --target-directory=%{buildroot}/usr/src/xserver < source-file-list -# unneeded python2 script; simply remove it (boo#1179591) -rm -f %{buildroot}/usr/src/xserver/config/fdi2iclass.py - %post %tmpfiles_create xkb.conf %{fillup_only -an displaymanager} @@ -634,8 +618,4 @@ fi %{_datadir}/aclocal/*.m4 /usr/lib/rpm/macros.d/macros.xorg-server -%files source -%defattr(-,root,root) -/usr/src/xserver - %changelog