rpms/xorg-x11-server
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Use the recommended way to apply conditional patches

Browse Source 
https://docs.fedoraproject.org/en-US/packaging-guidelines/SourceURL/#_do_not_conditionalize_sources
This commit is contained in:
Olivier Fourdan 2023-01-17 17:12:15 +01:00
parent 6c12217df8
commit 743d53fc69
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
xorg-x11-server.spec
View File

@ -46,7 +46,7 @@
Summary: X.Org X11 X server Summary: X.Org X11 X server
Name: xorg-x11-server Name: xorg-x11-server
Version: 1.20.14 Version: 1.20.14
Release: 15%{?gitdate:.%{gitdate}}%{?dist} Release: 16%{?gitdate:.%{gitdate}}%{?dist}
URL: http://www.x.org URL: http://www.x.org
License: MIT License: MIT
@ -134,11 +134,9 @@ Patch121: 0007-xkb-reset-the-radio_groups-pointer-to-NULL-after-fre.patch
# Fix for buggy patch to CVE-2022-46340 # Fix for buggy patch to CVE-2022-46340
Patch122: 0008-Xext-fix-invalid-event-type-mask-in-XTestSwapFakeInp.patch Patch122: 0008-Xext-fix-invalid-event-type-mask-in-XTestSwapFakeInp.patch
# Only on F38 and later # Only on F38 and later (patch number starts at 3801, see autopatch below)
%if 0%{fedora} >= 38
# Upstream commits 73d6e88, f69280dd and 4127776, minus the xwayland.pc.in change # Upstream commits 73d6e88, f69280dd and 4127776, minus the xwayland.pc.in change
Patch200: 0001-Disallow-byte-swapped-clients-by-default.patch Patch3801: 0001-Disallow-byte-swapped-clients-by-default.patch
%endif
BuildRequires: make BuildRequires: make
BuildRequires: systemtap-sdt-devel BuildRequires: systemtap-sdt-devel
@ -327,7 +325,11 @@ cp %{SOURCE1} .gitignore
# ick # ick
%global __scm git %global __scm git
%{expand:%__scm_setup_git -q} %{expand:%__scm_setup_git -q}
%if 0%{fedora} >= 38
%autopatch %autopatch
%else
%autopatch -M 3800
%endif
%if 0%{?stable_abi} %if 0%{?stable_abi}
# check the ABI in the source against what we expect. # check the ABI in the source against what we expect.
@ -550,6 +552,10 @@ find %{inst_srcdir}/hw/xfree86 -name \*.c -delete
%changelog %changelog
* Tue Jan 17 2023 Olivier Fourdan <ofourdan@redhat.com> - 1.20.14-16
- Use the recommended way to apply conditional patches without
conditionalizing the sources (for byte-swapped clients).
* Fri Jan 13 2023 Leif Liddy <leifliddy@fedoraproject.org> 1.20.14-15 * Fri Jan 13 2023 Leif Liddy <leifliddy@fedoraproject.org> 1.20.14-15
- Xorg server does not correctly select the DCP for the display - Xorg server does not correctly select the DCP for the display
without a quirk on Apple silicon machines (#2152414) without a quirk on Apple silicon machines (#2152414)