rpms/xorg-x11-server-Xwayland
5
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-19 16:06:08 +01:00
parent 764fdb6d82
commit 6efc7baa34
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
xorg-x11-server-Xwayland.spec
View File

@ -9,7 +9,7 @@
Summary: Xwayland Summary: Xwayland
Name: xorg-x11-server-Xwayland Name: xorg-x11-server-Xwayland
Version: 22.1.7 Version: 22.1.7
Release: 2%{?gitdate:.%{gitdate}git%{shortcommit}}%{?dist} Release: 3%{?gitdate:.%{gitdate}git%{shortcommit}}%{?dist}
URL: http://www.x.org URL: http://www.x.org
%if 0%{?gitdate} %if 0%{?gitdate}
@ -18,14 +18,12 @@ Source0: https://gitlab.freedesktop.org/xorg/%{pkgname}/-/archive/%{commit}/%{
Source0: https://www.x.org/pub/individual/xserver/%{pkgname}-%{version}.tar.xz Source0: https://www.x.org/pub/individual/xserver/%{pkgname}-%{version}.tar.xz
%endif %endif
# Only on F38 and later # Only on F38 and later (patch number starts at 3801, see autopatch below)
%if 0%{fedora} >= 38
# Disallow byte-swapped clients by default # Disallow byte-swapped clients by default
# https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1029 # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1029
Patch1: 0001-Fix-some-indentation-issues.patch Patch3801: 0001-Fix-some-indentation-issues.patch
Patch2: 0002-dix-localize-two-variables.patch Patch3802: 0002-dix-localize-two-variables.patch
Patch3: 0003-Disallow-byte-swapped-clients-by-default.patch Patch3803: 0003-Disallow-byte-swapped-clients-by-default.patch
%endif
License: MIT License: MIT
@ -101,7 +99,13 @@ The development package provides the developmental files which are
necessary for developing Wayland compositors using Xwayland. necessary for developing Wayland compositors using Xwayland.
%prep %prep
%autosetup -S git_am -n %{pkgname}-%{?gitdate:%{commit}}%{!?gitdate:%{version}} %autosetup -N -S git_am -n %{pkgname}-%{?gitdate:%{commit}}%{!?gitdate:%{version}}
%if 0%{fedora} >= 38
%autopatch
%else
%autopatch -M 3800
%endif
%build %build
%meson \ %meson \
@ -133,6 +137,10 @@ rm -Rf $RPM_BUILD_ROOT%{_localstatedir}/lib/xkb
%{_libdir}/pkgconfig/xwayland.pc %{_libdir}/pkgconfig/xwayland.pc
%changelog %changelog
* Thu Jan 19 2023 Olivier Fourdan <ofourdan@redhat.com> - 22.1.7-3
- Use the recommended way to apply conditional patches without
conditionalizing the sources (for byte-swapped clients).
* Tue Jan 17 2023 Olivier Fourdan <ofourdan@redhat.com> - 22.1.7-2 * Tue Jan 17 2023 Olivier Fourdan <ofourdan@redhat.com> - 22.1.7-2
- Disallow byte-swapped clients on Fedora 38 and above (#2159489) - Disallow byte-swapped clients on Fedora 38 and above (#2159489)