rpms/lorax
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Add patch downstream to replace retired/blocked xorg-x11-server-utils package

Browse Source
This commit is contained in:
Kevin Fenzi 2021-03-05 13:35:57 -08:00
parent 9fd32b245e
commit 454b68495f
2 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lorax.spec
View File

@ -4,7 +4,7 @@
Name: lorax
Version: 35.0
Release: 1%{?dist}
Release: 2%{?dist}
Summary: Tool for creating the anaconda install images
License: GPLv2+
@ -14,6 +14,7 @@ URL: https://github.com/weldr/lorax
# git checkout -b archive-branch lorax-%%{version}-%%{release}
# tito build --tgz
Source0: %{name}-%{version}.tar.gz
Patch0: xorg-x11-server-utils-retire.patch
BuildRequires: python3-devel
BuildRequires: make
@ -146,6 +147,7 @@ build images, etc. from the command line.
%prep
%setup -q -n %{name}-%{version}
%patch0 -p1
%build
@ -193,6 +195,9 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install
%{_mandir}/man1/composer-cli.1*
%changelog
* Fri Mar 05 2021 Kevin Fenzi <kevin@scrye.com> - 35.0-2
- Add patch downstream to replace retired/blocked xorg-x11-server-utils package
* Wed Mar 03 2021 Brian C. Lane <bcl@redhat.com> 35.0-1
- New lorax documentation - 35.0 (bcl@redhat.com)
- Makefile: Add test-in-podman and docs-in-podman build targets (bcl@redhat.com)

23
xorg-x11-server-utils-retire.patch Normal file
View File

@ -0,0 +1,23 @@
diff --color -Nur lorax-35.0.orig/share/templates.d/99-generic/runtime-cleanup.tmpl lorax-35.0/share/templates.d/99-generic/runtime-cleanup.tmpl
--- lorax-35.0.orig/share/templates.d/99-generic/runtime-cleanup.tmpl 2021-03-03 16:41:28.000000000 -0800
+++ lorax-35.0/share/templates.d/99-generic/runtime-cleanup.tmpl 2021-03-05 13:29:46.188665624 -0800
@@ -304,7 +304,6 @@
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}/*
diff --color -Nur lorax-35.0.orig/share/templates.d/99-generic/runtime-install.tmpl lorax-35.0/share/templates.d/99-generic/runtime-install.tmpl
--- lorax-35.0.orig/share/templates.d/99-generic/runtime-install.tmpl 2021-03-03 16:41:28.000000000 -0800
+++ lorax-35.0/share/templates.d/99-generic/runtime-install.tmpl 2021-03-05 13:30:51.555815175 -0800
@@ -90,7 +90,7 @@
## 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