packages/xorg-x11-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!86 disable Xwayland provide by xorg-x11-server-Xwayland

Browse Source 
From: @kerongw 
Reviewed-by: @yanan-rock 
Signed-off-by: @yanan-rock
This commit is contained in:
openeuler-ci-bot 2022-06-25 06:43:10 +00:00 committed by Gitee
commit 9987d8b518
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
xorg-x11-server.spec
View File

@ -16,7 +16,7 @@
Name: xorg-x11-server Name: xorg-x11-server
Version: 1.20.11 Version: 1.20.11
Release: 5 Release: 6
Summary: X.Org X11 X server Summary: X.Org X11 X server
License: MIT and GPLv2 License: MIT and GPLv2
URL: https://www.x.org URL: https://www.x.org
@ -108,8 +108,8 @@ Requires: pixman >= 0.30.0 xkeyboard-config xkbcomp
Requires: system-setup-keyboard xorg-x11-drv-libinput libEGL Requires: system-setup-keyboard xorg-x11-drv-libinput libEGL
Requires: xorg-x11-xauth Requires: xorg-x11-xauth
Requires: xorg-x11-server-common >= %{version}-%{release} Requires: xorg-x11-server-common >= %{version}-%{release}
Obsoletes: %{name}-Xorg < %{version}-%{release} %{name}-Xwayland < %{version}-%{release} Obsoletes: %{name}-Xorg < %{version}-%{release}
Provides: %{name}-Xorg = %{version}-%{release} %{name}-Xorg%{?_isa} = %{version}-%{release} %{name}-Xwayland = %{version}-%{release} %{name}-Xwayland%{?_isa} = %{version}-%{release} Provides: %{name}-Xorg = %{version}-%{release} %{name}-Xorg%{?_isa} = %{version}-%{release}
Provides: Xorg = %{version}-%{release} Provides: Xorg = %{version}-%{release}
Obsoletes: Xorg < %{version}-%{release} Obsoletes: Xorg < %{version}-%{release}
@ -267,7 +267,7 @@ autoreconf -ivf || exit 1
%configure %{xservers} \ %configure %{xservers} \
--enable-dependency-tracking \ --enable-dependency-tracking \
--enable-xwayland-eglstream \ --disable-xwayland-eglstream \
--with-pic \ --with-pic \
%{?no_int10} --with-int10=x86emu \ %{?no_int10} --with-int10=x86emu \
--with-default-font-path=%{default_font_path} \ --with-default-font-path=%{default_font_path} \
@ -282,7 +282,7 @@ autoreconf -ivf || exit 1
--enable-config-udev \ --enable-config-udev \
--disable-unit-tests \ --disable-unit-tests \
--enable-dmx \ --enable-dmx \
--enable-xwayland \ --disable-xwayland \
%{dri_flags} %{?bodhi_flags} \ %{dri_flags} %{?bodhi_flags} \
${CONFIGURE} ${CONFIGURE}
@ -341,7 +341,6 @@ find %{inst_srcdir}/hw/xfree86 -name \*.c -delete
%files common %files common
%doc COPYING %doc COPYING
%{_mandir}/man1/Xserver.1*
%{_libdir}/xorg/protocol.txt %{_libdir}/xorg/protocol.txt
%dir %{_localstatedir}/lib/xkb %dir %{_localstatedir}/lib/xkb
%{_localstatedir}/lib/xkb/README.compiled %{_localstatedir}/lib/xkb/README.compiled
@ -357,7 +356,6 @@ find %{inst_srcdir}/hw/xfree86 -name \*.c -delete
%config %attr(0644,root,root) %{_sysconfdir}/pam.d/xserver %config %attr(0644,root,root) %{_sysconfdir}/pam.d/xserver
%{_bindir}/X %{_bindir}/X
%{_bindir}/Xorg %{_bindir}/Xorg
%{_bindir}/Xwayland
%{_libexecdir}/Xorg %{_libexecdir}/Xorg
%{Xorgperms} %{_libexecdir}/Xorg.wrap %{Xorgperms} %{_libexecdir}/Xorg.wrap
%{_bindir}/cvt %{_bindir}/cvt
@ -426,10 +424,11 @@ find %{inst_srcdir}/hw/xfree86 -name \*.c -delete
%defattr(-,root,root) %defattr(-,root,root)
%doc ChangeLog README.md %doc ChangeLog README.md
%{_mandir}/man*/* %{_mandir}/man*/*
%{_localstatedir}/lib/xkb/README.compiled
%{_libdir}/xorg/protocol.txt
%changelog %changelog
* Fri Jun 24 2022 wangkerong<wangkerong@h-partners.com> - 1.20.11-6
- disable Xwayland provide by xorg-x11-server-Xwayland
- delete the same files of common and help
* Mon Jun 6 2022 houjinchang <houjinchang@huawei.com> - 1.20.11-5 * Mon Jun 6 2022 houjinchang <houjinchang@huawei.com> - 1.20.11-5
- Type:bugfix - Type:bugfix