almalinux/lorax
12
0
Fork 0
Code Issues Pull Requests Releases Activity

xorg-x11-server-utils was split up in Fedora 34, so adjust templates

Browse Source 
In f34 and beyond, the old xorg-x11-server-utils package was split up
into seperate packages for each util. This was to allow them to rev at
their own pace instead of requiring all of them to rebuild at once.
See https://bugzilla.redhat.com/show_bug.cgi?id=1932754
and
https://fedoraproject.org/wiki/Changes/XorgUtilityDeaggregation

We need to adjust lorax (in f34+) to not try and remove the
xorg-x11-server-utils package (as it no longer exists) and also to
install the 2 utils that we need from it for installs.

Signed-off-by: Kevin Fenzi <kevin@scrye.com>
(cherry picked from commit 55371c9968)
This commit is contained in:
Kevin Fenzi 2021-03-08 10:19:49 -08:00 committed by Brian C. Lane
parent ad476723fe
commit 8ae499bb06
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
share/templates.d/99-generic/runtime-cleanup.tmpl
View File

@ -303,7 +303,6 @@ removefrom xorg-x11-drv-intel /usr/${libdir}/libI*
removefrom xorg-x11-drv-openchrome /usr/${libdir}/libchrome*
removefrom xorg-x11-drv-wacom /usr/bin/*
removefrom xorg-x11-fonts-misc --allbut /usr/share/X11/fonts/misc/{6x13,encodings,fonts,*cursor}*
removefrom xorg-x11-server-utils --allbut /usr/bin/xrandr /usr/bin/xrdb
removefrom ${product.name}-logos /etc/*
removefrom ${product.name}-logos /usr/share/icons/{Bluecurve,oxygen}/*
removefrom ${product.name}-logos /usr/share/{firstboot,kde4,pixmaps}/*

2
share/templates.d/99-generic/runtime-install.tmpl
View File

@ -90,7 +90,7 @@ installpkg rsyslog
## xorg/GUI packages
installpkg xorg-x11-drivers xorg-x11-server-Xorg
installpkg xorg-x11-server-utils xorg-x11-xauth
installpkg xrandr xrdb xorg-x11-xauth
installpkg dbus-x11 metacity gsettings-desktop-schemas
installpkg nm-connection-editor
installpkg librsvg2