From 7148e2cd361f15693e5d6f606cae881a571e34c8 Mon Sep 17 00:00:00 2001 From: lingsheng <860373352@qq.com> Date: Fri, 25 Oct 2024 02:50:03 +0000 Subject: [PATCH] fix x86_64 build Macro %delete_la was defined to %nil in openEuler-rpm-config-31-1, .la files are deleted automatically during %install stage. So, remove %delete_la in spec now. --- xorg-x11-server.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index 97b7d49..91dbe54 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -16,7 +16,7 @@ Name: xorg-x11-server Version: 1.20.11 -Release: 32 +Release: 33 Summary: X.Org X11 X server License: MIT and GPLv2 URL: https://www.x.org @@ -377,12 +377,9 @@ find . -type f | egrep '.*\.(c|h|am|ac|inc|m4|h.in|pc.in|man.pre|pl|txt)$' | xargs tar cf - | (cd %{inst_srcdir} && tar xf -) find %{inst_srcdir}/hw/xfree86 -name \*.c -delete -{ -%delete_la %ifnarch %{ix86} x86_64 sw_64 rm -f %{buildroot}/%{_libdir}/xorg/modules/lib{int10,vbe}.so %endif -} %files common %doc COPYING @@ -468,6 +465,12 @@ find %{inst_srcdir}/hw/xfree86 -name \*.c -delete %{_mandir}/man*/* %changelog +* Fri Oct 25 2024 lingsheng - 1.20.11-33 +- Type:bugfix +- CVE:NA +- SUG:NA +- DESC:fix x86_64 build + * Thu May 30 2024 shuaijiakun -1.20.11-32 - Type:feature - CVE:NA -- Gitee