rpm/xorg-x11-server
SHA256
1
0
Fork 0
forked from pool/xorg-x11-server
Code Pull Requests Activity

Accepting request 1146793 from home:jtorres:branches:X11:XOrg

Browse Source 
- 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.

OBS-URL: https://build.opensuse.org/request/show/1146793
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-server?expand=0&rev=877
This commit is contained in:
Stefan Dirsch 2024-02-15 11:54:17 +00:00 committed by Git OBS Bridge
parent 670f3724ce
commit 31a9dd9b98
2 changed files with 8 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
xorg-x11-server.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Thu Feb 15 10:46:29 UTC 2024 - Joan Torres <joan.torres@suse.com>
- 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 <sndirsch@suse.com>

22
xorg-x11-server.spec
View File

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