From eef18ecfa21121394ff0bef3abbc13f7e425e418 Mon Sep 17 00:00:00 2001 From: panchenbo Date: Mon, 24 Apr 2023 10:24:51 +0800 Subject: [PATCH] fix sw_64 build error and changelog error (cherry picked from commit 8e0dcaf094a180bff926a94b2e1a3f282e74e0bf) --- xorg-x11-server.spec | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index b4dd754..3575301 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -16,7 +16,7 @@ Name: xorg-x11-server Version: 1.20.11 -Release: 18 +Release: 19 Summary: X.Org X11 X server License: MIT and GPLv2 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/libvgahw.so %{_libdir}/xorg/modules/libwfb.so -%ifarch %{ix86} x86_64 +%ifarch %{ix86} x86_64 sw_64 %{_libdir}/xorg/modules/libint10.so %{_libdir}/xorg/modules/libvbe.so %endif @@ -444,16 +444,19 @@ find %{inst_srcdir}/hw/xfree86 -name \*.c -delete %{_mandir}/man*/* %changelog -* Wed Apr 12 2023 liweiganga -1.20.11-18 +* Mon Apr 24 2023 panchenbo - 1.20.11-19 +- fix sw_64 build error and changelog error + +* Wed Apr 12 2023 liweiganga - 1.20.11-18 - fix CVE-2023-1393 -* Mon Mar 20 2023 liweiganga -1.20.11-17 +* Mon Mar 20 2023 liweiganga - 1.20.11-17 - feat: all man files is provided by help package -* Fri Feb 17 2023 liweiganga -1.20.11-16 +* Fri Feb 17 2023 liweiganga - 1.20.11-16 - fix CVE-2023-0494 -* Tue Jan 10 2023 zhouwenpei -1.20.11-15 +* Tue Jan 10 2023 zhouwenpei - 1.20.11-15 - add missing patches * Thu Dec 22 2022 wanglin - 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 - Fix changelog date -* Wed Dec 21 2022 zhouwenpei -1.20.11-13 +* Wed Dec 21 2022 zhouwenpei - 1.20.11-13 - fix CVE-2022-4283,CVE-2022-46340,CVE-2022-46341,CVE-2022-46342,CVE-2022-46343,CVE-2022-46344 -* Fri Nov 18 2022 wangkerong -1.20.11-12 +* Fri Nov 18 2022 wangkerong - 1.20.11-12 - fix CVE-2022-3551,CVE-2022-3553 * Wed Oct 26 2022 wuzx - 1.20.11-11