fix sw_64 build error and changelog error

(cherry picked from commit 8e0dcaf094a180bff926a94b2e1a3f282e74e0bf)
This commit is contained in:
panchenbo 2023-04-24 10:24:51 +08:00 committed by openeuler-sync-bot
parent 984e7dfdf9
commit eef18ecfa2

View File

@ -16,7 +16,7 @@
Name: xorg-x11-server Name: xorg-x11-server
Version: 1.20.11 Version: 1.20.11
Release: 18 Release: 19
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
@ -396,7 +396,7 @@ find %{inst_srcdir}/hw/xfree86 -name \*.c -delete
%{_libdir}/xorg/modules/libshadowfb.so %{_libdir}/xorg/modules/libshadowfb.so
%{_libdir}/xorg/modules/libvgahw.so %{_libdir}/xorg/modules/libvgahw.so
%{_libdir}/xorg/modules/libwfb.so %{_libdir}/xorg/modules/libwfb.so
%ifarch %{ix86} x86_64 %ifarch %{ix86} x86_64 sw_64
%{_libdir}/xorg/modules/libint10.so %{_libdir}/xorg/modules/libint10.so
%{_libdir}/xorg/modules/libvbe.so %{_libdir}/xorg/modules/libvbe.so
%endif %endif
@ -444,16 +444,19 @@ find %{inst_srcdir}/hw/xfree86 -name \*.c -delete
%{_mandir}/man*/* %{_mandir}/man*/*
%changelog %changelog
* Wed Apr 12 2023 liweiganga <liweiganga@uniontech.com> -1.20.11-18 * Mon Apr 24 2023 panchenbo <panchenbo@kylinsec.com.cn> - 1.20.11-19
- fix sw_64 build error and changelog error
* Wed Apr 12 2023 liweiganga <liweiganga@uniontech.com> - 1.20.11-18
- fix CVE-2023-1393 - fix CVE-2023-1393
* Mon Mar 20 2023 liweiganga <liweiganga@uniontech.com> -1.20.11-17 * Mon Mar 20 2023 liweiganga <liweiganga@uniontech.com> - 1.20.11-17
- feat: all man files is provided by help package - feat: all man files is provided by help package
* Fri Feb 17 2023 liweiganga <liweiganga@uniontech.com> -1.20.11-16 * Fri Feb 17 2023 liweiganga <liweiganga@uniontech.com> - 1.20.11-16
- fix CVE-2023-0494 - fix CVE-2023-0494
* Tue Jan 10 2023 zhouwenpei <zhouwenpei1@h-partners.com> -1.20.11-15 * Tue Jan 10 2023 zhouwenpei <zhouwenpei1@h-partners.com> - 1.20.11-15
- add missing patches - add missing patches
* Thu Dec 22 2022 wanglin <wangl29@chinatelecom.cn> - 1.20.11-14 * Thu Dec 22 2022 wanglin <wangl29@chinatelecom.cn> - 1.20.11-14
@ -461,10 +464,10 @@ find %{inst_srcdir}/hw/xfree86 -name \*.c -delete
- use -git instead of .git as the filename, to avoid .git ignore - use -git instead of .git as the filename, to avoid .git ignore
- Fix changelog date - Fix changelog date
* Wed Dec 21 2022 zhouwenpei <zhouwenpei1@h-partners.com> -1.20.11-13 * Wed Dec 21 2022 zhouwenpei <zhouwenpei1@h-partners.com> - 1.20.11-13
- fix CVE-2022-4283,CVE-2022-46340,CVE-2022-46341,CVE-2022-46342,CVE-2022-46343,CVE-2022-46344 - fix CVE-2022-4283,CVE-2022-46340,CVE-2022-46341,CVE-2022-46342,CVE-2022-46343,CVE-2022-46344
* Fri Nov 18 2022 wangkerong <wangkerong@h-partners.com> -1.20.11-12 * Fri Nov 18 2022 wangkerong <wangkerong@h-partners.com> - 1.20.11-12
- fix CVE-2022-3551,CVE-2022-3553 - fix CVE-2022-3551,CVE-2022-3553
* Wed Oct 26 2022 wuzx<wuzx1226@qq.com> - 1.20.11-11 * Wed Oct 26 2022 wuzx<wuzx1226@qq.com> - 1.20.11-11