fix .git and openEuler hardcode problem

This commit is contained in:
zhouwenpei 2023-01-05 09:28:52 +00:00
parent 5cbf097aa7
commit 8166be5e1b
2 changed files with 9 additions and 4 deletions

View File

@ -16,7 +16,7 @@
Name: xorg-x11-server
Version: 1.20.8
Release: 14
Release: 15
Summary: X.Org X11 X server
License: MIT and GPLv2
URL: https://www.x.org
@ -30,7 +30,7 @@ Source20: http://svn.exactcode.de/t2/trunk/package/xorg/xorg-server/xvfb-r
# for requires generation in drivers
Source30: xserver-sdk-abi-requires.release
Source31: xserver-sdk-abi-requires.git
Source31: xserver-sdk-abi-requires-git
# maintainer convenience script
Source40: driver-abi-rebuild.sh
@ -221,7 +221,7 @@ export CFLAGS="$RPM_OPT_FLAGS -specs=/usr/lib/rpm/generic-hardened-cc1"
%global xservers --enable-xvfb --enable-xnest %{kdrive} --enable-xorg
%global default_font_path "catalogue:/etc/X11/fontpath.d,built-ins"
%global kdrive --enable-kdrive --enable-xephyr --disable-xfake --disable-xfbdev
%global bodhi_flags --with-vendor-name="openEuler Project"
%global bodhi_flags --with-vendor-name="%{_vendor} Project"
%global dri_flags --enable-dri --enable-dri2 --enable-dri3 --enable-suid-wrapper --enable-glamor
autoreconf -ivf || exit 1
@ -343,6 +343,11 @@ find %{inst_srcdir}/hw/xfree86 -name \*.c -delete
%{_libdir}/xorg/protocol.txt
%changelog
* Thu Jan 05 2023 zhouwenpei <zhouwenpei1@h-partners.com> - 1.20.8-14
- Fix openEuler hard code problem
- use -git instead of .git as the filename, to avoid .git ignore
- Fix changelog date
* Wed Dec 21 2022 zhouwenpei <zhouwenpei1@h-partners.com> - 1.20.8-14
- fix CVE-2022-4283,CVE-2022-46340,CVE-2022-46341,CVE-2022-46342,CVE-2022-46343,CVE-2022-46344
@ -433,7 +438,7 @@ find %{inst_srcdir}/hw/xfree86 -name \*.c -delete
- SUG:NA
- DESC:update version to 1.20.6
* Thu Jan 3 2020 openEuler Buildteam <buildteam@openeuler.org> - 1.20.1-12
* Fri Jan 3 2020 openEuler Buildteam <buildteam@openeuler.org> - 1.20.1-12
- Type:bugfix
- ID:NA
- SUG:NA