From fad832074ca5647cce6797cb499bcd970ac55331 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Jun 27 2021 21:52:54 +0000 Subject: Debrand the liveinst welcome widget --- diff --git a/SOURCES/20001-Import-RPM-certificates-at-end-of-installation.patch b/SOURCES/20001-Import-RPM-certificates-at-end-of-installation.patch index 96253ac..e693ccc 100644 --- a/SOURCES/20001-Import-RPM-certificates-at-end-of-installation.patch +++ b/SOURCES/20001-Import-RPM-certificates-at-end-of-installation.patch @@ -1,7 +1,7 @@ From 4ebcf9d422bef11bd5b50f421a4b30ed826d1cbb Mon Sep 17 00:00:00 2001 From: Vladimir Slavik Date: Tue, 15 Sep 2020 09:57:58 +0200 -Subject: [PATCH 20001/20005] Import RPM certificates at end of installation +Subject: [PATCH 20001/20006] Import RPM certificates at end of installation This adds code and a new config key for importing RPM certificates, and enables it for all of Fedora. diff --git a/SOURCES/20002-Define-the-updates-repositories-in-the-Anaconda-con.patch b/SOURCES/20002-Define-the-updates-repositories-in-the-Anaconda-con.patch index 670a580..a25b5f4 100644 --- a/SOURCES/20002-Define-the-updates-repositories-in-the-Anaconda-con.patch +++ b/SOURCES/20002-Define-the-updates-repositories-in-the-Anaconda-con.patch @@ -1,7 +1,7 @@ From 5d5d1a7099537a0da7c5a54520d7474b4696d940 Mon Sep 17 00:00:00 2001 From: Vendula Poncova Date: Fri, 27 Nov 2020 13:30:53 +0100 -Subject: [PATCH 20002/20005] Define the updates repositories in the Anaconda +Subject: [PATCH 20002/20006] Define the updates repositories in the Anaconda configuration files (#1642513) Replace the enable_updates configuration option with the updates_repositories diff --git a/SOURCES/20003-Revert-Remove-kickstart-btrfs-support.patch b/SOURCES/20003-Revert-Remove-kickstart-btrfs-support.patch index a5b5a99..2d08a81 100644 --- a/SOURCES/20003-Revert-Remove-kickstart-btrfs-support.patch +++ b/SOURCES/20003-Revert-Remove-kickstart-btrfs-support.patch @@ -1,7 +1,7 @@ From 1a19890f66c6e746f3d6a9cd5c981946552e07a7 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Fri, 14 May 2021 15:03:05 -0400 -Subject: [PATCH 20003/20005] Revert "Remove kickstart btrfs support" +Subject: [PATCH 20003/20006] Revert "Remove kickstart btrfs support" Restore Btrfs support for Kickstart so system installations can use Btrfs and images can be built using Lorax with Btrfs as the diff --git a/SOURCES/20004-Add-product-configuration-for-CentOS-Stream-Hypersc.patch b/SOURCES/20004-Add-product-configuration-for-CentOS-Stream-Hypersc.patch index 39a6148..b71ff6a 100644 --- a/SOURCES/20004-Add-product-configuration-for-CentOS-Stream-Hypersc.patch +++ b/SOURCES/20004-Add-product-configuration-for-CentOS-Stream-Hypersc.patch @@ -1,7 +1,7 @@ From 225e4acb9ec64c8fdc944c485aff74bc0441f171 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Sat, 26 Jun 2021 08:21:49 -0400 -Subject: [PATCH 20004/20005] Add product configuration for CentOS Stream +Subject: [PATCH 20004/20006] Add product configuration for CentOS Stream Hyperscale variant This is a minimal product configuration layered on top of the diff --git a/SOURCES/20005-Storage-add-btrfs_compression-option.patch b/SOURCES/20005-Storage-add-btrfs_compression-option.patch index dd02328..62baf93 100644 --- a/SOURCES/20005-Storage-add-btrfs_compression-option.patch +++ b/SOURCES/20005-Storage-add-btrfs_compression-option.patch @@ -1,7 +1,7 @@ From ab2ee2d89ed127fcd59326bec85a9404dbbaa425 Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Tue, 16 Feb 2021 18:39:29 -0800 -Subject: [PATCH 20005/20005] [Storage] add btrfs_compression option +Subject: [PATCH 20005/20006] [Storage] add btrfs_compression option This is a new option to allow specifying the compression algorithm and level for Btrfs filesystems. If set, it will be passed to Blivet and diff --git a/SOURCES/20006-Change-rhel-welcome-to-centos-welcome.patch b/SOURCES/20006-Change-rhel-welcome-to-centos-welcome.patch new file mode 100644 index 0000000..4371c6b --- /dev/null +++ b/SOURCES/20006-Change-rhel-welcome-to-centos-welcome.patch @@ -0,0 +1,114 @@ +From 32dede4a858792a6ff5ce57e4552ae42f35b17d3 Mon Sep 17 00:00:00 2001 +From: Neal Gompa +Date: Sun, 27 Jun 2021 17:46:23 -0400 +Subject: [PATCH 20006/20006] Change rhel-welcome to centos-welcome + +This is being used for CentOS Stream rather than +Red Hat Enterprise Linux, so adjust accordingly. +--- + data/liveinst/gnome/Makefile.am | 16 ++++++++-------- + ...el-welcome.desktop => centos-welcome.desktop} | 4 ++-- + .../gnome/{rhel-welcome.js => centos-welcome.js} | 8 ++++---- + 3 files changed, 14 insertions(+), 14 deletions(-) + rename data/liveinst/gnome/{rhel-welcome.desktop => centos-welcome.desktop} (57%) + rename data/liveinst/gnome/{rhel-welcome.js => centos-welcome.js} (94%) + +diff --git a/data/liveinst/gnome/Makefile.am b/data/liveinst/gnome/Makefile.am +index b295281f3..f7bd07a52 100644 +--- a/data/liveinst/gnome/Makefile.am ++++ b/data/liveinst/gnome/Makefile.am +@@ -16,24 +16,24 @@ + # along with this program. If not, see . + + welcomedir = $(datadir)/$(PACKAGE_NAME)/gnome +-dist_welcome_DATA = rhel-welcome.desktop +-dist_welcome_SCRIPTS = rhel-welcome.js ++dist_welcome_DATA = centos-welcome.desktop ++dist_welcome_SCRIPTS = centos-welcome.js + + MAINTAINERCLEANFILES = Makefile.in + + # Merge the translations into the desktop file + # Use the merged translations in $(builddir). If no merged translations exist, + # just exit. +-# Rename rhel-welcome.js to just rhel-welcome ++# Rename centos-welcome.js to just centos-welcome + install-data-hook: + for p in $(top_builddir)/po/*.mpo ; do \ + [ -e $$p ] || exit 0 ; \ +- $(MSGFMT) --desktop --template=$(DESTDIR)$(welcomedir)/rhel-welcome.desktop \ ++ $(MSGFMT) --desktop --template=$(DESTDIR)$(welcomedir)/centos-welcome.desktop \ + --locale=$$(basename $$p .mpo) \ +- -o $(DESTDIR)$(welcomedir)/rhel-welcome.desktop.new $$p || exit 1 ; \ +- mv $(DESTDIR)$(welcomedir)/rhel-welcome.desktop.new $(DESTDIR)$(welcomedir)/rhel-welcome.desktop || exit 1 ; \ ++ -o $(DESTDIR)$(welcomedir)/centos-welcome.desktop.new $$p || exit 1 ; \ ++ mv $(DESTDIR)$(welcomedir)/centos-welcome.desktop.new $(DESTDIR)$(welcomedir)/centos-welcome.desktop || exit 1 ; \ + done +- cd $(DESTDIR)$(welcomedir) && mv rhel-welcome.js rhel-welcome ++ cd $(DESTDIR)$(welcomedir) && mv centos-welcome.js centos-welcome + + uninstall-hook: +- -cd $(DESTDIR)$(welcomedir) && rm -f rhel-welcome ++ -cd $(DESTDIR)$(welcomedir) && rm -f centos-welcome +diff --git a/data/liveinst/gnome/rhel-welcome.desktop b/data/liveinst/gnome/centos-welcome.desktop +similarity index 57% +rename from data/liveinst/gnome/rhel-welcome.desktop +rename to data/liveinst/gnome/centos-welcome.desktop +index 8f81a1b18..ce68d9264 100644 +--- a/data/liveinst/gnome/rhel-welcome.desktop ++++ b/data/liveinst/gnome/centos-welcome.desktop +@@ -1,6 +1,6 @@ + [Desktop Entry] +-Name=Welcome to Red Hat Enterprise Linux +-Exec=/usr/share/anaconda/gnome/rhel-welcome ++Name=Welcome to CentOS Stream ++Exec=/usr/share/anaconda/gnome/centos-welcome + Terminal=false + Type=Application + StartupNotify=true +diff --git a/data/liveinst/gnome/rhel-welcome.js b/data/liveinst/gnome/centos-welcome.js +similarity index 94% +rename from data/liveinst/gnome/rhel-welcome.js +rename to data/liveinst/gnome/centos-welcome.js +index 7b6df634f..eda6399d8 100755 +--- a/data/liveinst/gnome/rhel-welcome.js ++++ b/data/liveinst/gnome/centos-welcome.js +@@ -59,7 +59,7 @@ const WelcomeWindow = new Lang.Class({ + default_width: 600, + default_height: 550, + skip_taskbar_hint: true, +- title: _("Welcome to Red Hat Enterprise Linux"), ++ title: _("Welcome to CentOS Stream"), + window_position: Gtk.WindowPosition.CENTER }); + this.window.connect('key-press-event', Lang.bind(this, + function(w, event) { +@@ -88,7 +88,7 @@ const WelcomeWindow = new Lang.Class({ + spacing: 16 }); + tryContent.add(new Gtk.Image({ icon_name: 'media-optical', + pixel_size: 256 })); +- tryContent.add(makeLabel(_("Try RHEL"), true)); ++ tryContent.add(makeLabel(_("Try CentOS"), true)); + + let tryButton = new Gtk.Button({ child: tryContent }); + buttonBox.add(tryButton); +@@ -104,7 +104,7 @@ const WelcomeWindow = new Lang.Class({ + let installButton = new Gtk.Button({ child: installContent }); + buttonBox.add(installButton); + +- this._label = makeLabel(_("You are currently running Red Hat Enterprise Linux from live media.\nYou can install Red Hat Enterprise Linux now, or choose \"Install to Hard Drive\" in the Activities Overview at any later time."), false); ++ this._label = makeLabel(_("You are currently running CentOS Stream from live media.\nYou can install CentOS Stream now, or choose \"Install to Hard Drive\" in the Activities Overview at any later time."), false); + mainGrid.add(this._label); + + installButton.connect('clicked', Lang.bind(this, +@@ -145,7 +145,7 @@ const WelcomeWindow = new Lang.Class({ + Gettext.bindtextdomain('anaconda', LOCALE_DIR); + Gettext.textdomain('anaconda'); + +-GLib.set_prgname('rhel-welcome'); ++GLib.set_prgname('centos-welcome'); + Gtk.init(null, null); + Gtk.Settings.get_default().gtk_application_prefer_dark_theme = true; + +-- +2.31.1 + diff --git a/SPECS/anaconda.spec b/SPECS/anaconda.spec index 1b59a84..643f4e4 100644 --- a/SPECS/anaconda.spec +++ b/SPECS/anaconda.spec @@ -22,6 +22,7 @@ Patch20002: 20002-Define-the-updates-repositories-in-the-Anaconda-con.patch Patch20003: 20003-Revert-Remove-kickstart-btrfs-support.patch Patch20004: 20004-Add-product-configuration-for-CentOS-Stream-Hypersc.patch Patch20005: 20005-Storage-add-btrfs_compression-option.patch +Patch20006: 20006-Change-rhel-welcome-to-centos-welcome.patch # Versions of required components (done so we make sure the buildrequires # match the requires versions of things). @@ -55,6 +56,7 @@ Patch20005: 20005-Storage-add-btrfs_compression-option.patch BuildRequires: audit-libs-devel BuildRequires: libtool BuildRequires: gettext-devel >= %{gettextver} +BuildRequires: git-core BuildRequires: gtk3-devel >= %{gtk3ver} BuildRequires: gtk-doc BuildRequires: gtk3-devel-docs >= %{gtk3ver} @@ -275,7 +277,7 @@ options. This includes driver disks, kickstarts, and finding the anaconda runtime on NFS/HTTP/FTP servers or local disks. %prep -%autosetup -p 1 +%autosetup -S git_am %build # use actual build-time release number, not tarball creation time release number @@ -379,6 +381,9 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{buildroot}%{_d %{_prefix}/libexec/anaconda/dd_* %changelog +* Sun Jun 27 2021 Neal Gompa - 33.16.5.2-3 +- Debrand the liveinst welcome widget + * Sat Jun 26 2021 Neal Gompa - 33.16.5.2-2 - Add changes for CentOS Hyperscale spin + Re-enable Btrfs support