Merge remote-tracking branch 'cs/c9s' into eln

This commit is contained in:
Stephen Gallagher 2022-03-08 12:14:50 -05:00
commit 9054ed9934
No known key found for this signature in database
GPG Key ID: 45DB85A568286D11
5 changed files with 10 additions and 6 deletions

1
.gitignore vendored
View File

@ -7,3 +7,4 @@
/lorax-templates-rhel-10.0-7.tar.gz
/lorax-templates-rhel-10.0-8.tar.gz
/lorax-templates-rhel-10.0-9.tar.gz
/lorax-templates-rhel-10.0-10.tar.gz

View File

@ -4,7 +4,7 @@
## anaconda package
installpkg anaconda anaconda-widgets kexec-tools-anaconda-addon anaconda-install-img-deps
installpkg oscap-anaconda-addon
# installpkg redhat-release-eula
installpkg redhat-release-eula
## FIXME Pull in device-mapper-multipath
## This *should* be pulled in by libblockdev-plugins-all and libblockdev-mpath but it is not
@ -163,7 +163,7 @@ installpkg google-noto-sans-cjk-ttc-fonts
## debugging/bug reporting tools
installpkg gdb-gdbserver
installpkg libreport-plugin-bugzilla libreport-plugin-reportuploader
# installpkg libreport-rhel-anaconda-bugzilla
installpkg libreport-rhel-anaconda-bugzilla
installpkg python3-pyatspi
## extra tools not required by anaconda

2
SERIAL
View File

@ -1 +1 @@
9
10

View File

@ -1,6 +1,6 @@
Name: lorax-templates-rhel
Version: 10.0
Release: 9%{?dist}
Release: 10%{?dist}
Summary: RHEL build templates for lorax and livemedia-creator
License: GPLv2+
@ -10,7 +10,7 @@ BuildArch: noarch
# This tarball is generated from the contents of this dist-git repository
# by running the command `make tar`.
# See README for full details of how to update this package
Source0: lorax-templates-rhel-10.0-9.tar.gz
Source0: lorax-templates-rhel-10.0-10.tar.gz
# Required for the template branding support
Requires: lorax >= 34.9.1
@ -38,6 +38,9 @@ cp -a 80-rhel/* $RPM_BUILD_ROOT/%{templatedir}
%{templatedir}/*
%changelog
* Tue Mar 08 2022 Stephen Gallagher <sgallagh@redhat.com> - 10.0-10
- Re-sync from CentOS Stream 9
* Mon Feb 07 2022 Stephen Gallagher <sgallagh@redhat.com> - 10.0-9
- Update to new Malaysian font

View File

@ -1 +1 @@
SHA512 (lorax-templates-rhel-10.0-9.tar.gz) = d6559ac7e5354d2a4858f6a5d44b190f85822f8855f24292bcc00cbc6303435306073deb139d9880c41d0cdc92a3905bb1fab247818ad27452ccf5f7af06a3cd
SHA512 (lorax-templates-rhel-10.0-10.tar.gz) = 883949794f48160b036e70856b0d8574425aea07e3720714d7491a210785e6e919f8b09d01a3452501d567c8e56232d88d39aa79e37878d4a02113e5793ca20f