chore: Revert recent package changes for now

Containerfile

@@ -333,6 +333,7 @@ RUN --mount=type=cache,dst=/var/cache/rpm-ostree \
     --from repo=copr:copr.fedorainfracloud.org:kylegospo:bazzite-multilib \
         mesa-libxatracker \
         mesa-libglapi \
+        mesa-dri-drivers \
         mesa-libgbm \
         mesa-libEGL \
         mesa-vulkan-drivers \

spec_files/anaconda/anaconda.spec

@@ -1,8 +1,7 @@
 Summary: Graphical system installer
 Name:    anaconda
-Version: 42.13
+Version: 41.35
 Release: 100.bazzite
-ExcludeArch: %{ix86}
 License: GPL-2.0-or-later
 URL:     http://fedoraproject.org/wiki/Anaconda
 
@@ -29,7 +28,7 @@ Patch0:  bazzite.patch
 %define dasbusver 1.3
 %define dbusver 1.2.3
 %define dnfver 3.6.0
-%define dracutver 102-3
+%define dracutver 034-7
 %define fcoeutilsver 1.0.12-3.20100323git
 %define gettextver 0.19.8
 %define gtk3ver 3.22.17
@@ -38,6 +37,7 @@ Patch0:  bazzite.patch
 %define libarchivever 3.0.4
 %define libblockdevver 2.1
 %define libreportanacondaver 2.0.21-1
+%define libxklavierver 5.4
 %define mehver 0.23-1
 %define nmver 1.0
 %define pykickstartver 3.58-1
@@ -48,7 +48,6 @@ Patch0:  bazzite.patch
 %define subscriptionmanagerver 1.26
 %define utillinuxver 2.15.1
 %define rpmostreever 2023.2
-%define s390utilscorever 2.31.0
 
 BuildRequires: libtool
 BuildRequires: gettext-devel >= %{gettextver}
@@ -60,10 +59,11 @@ BuildRequires: gobject-introspection-devel
 %if %{with glade}
 BuildRequires: glade-devel
 %endif
+BuildRequires: libxklavier-devel >= %{libxklavierver}
 BuildRequires: make
 BuildRequires: pango-devel
 BuildRequires: python3-devel
-BuildRequires: systemd-rpm-macros
+BuildRequires: systemd
 # rpm and libarchive are needed for driver disk handling
 BuildRequires: rpm-devel >= %{rpmver}
 BuildRequires: libarchive-devel >= %{libarchivever}
@@ -82,9 +82,6 @@ Requires: anaconda-tui = %{version}-%{release}
 The anaconda package is a metapackage for the Anaconda installer.
 
 %package core
-# Since the binaries in anaconda-core are shell or Python scripts,
-# there's no need to generate a debuginfo package
-%define debug_package %{nil}
 Summary: Core of the Anaconda installer
 # core/signal.py is under MIT
 License: GPL-2.0-or-later AND MIT
@@ -99,7 +96,7 @@ Requires: python3-meh >= %{mehver}
 %if 0%{?rhel} < 10 || 0%{?fedora}
 Requires: libreport-anaconda >= %{libreportanacondaver}
 %endif
-Requires: python3-libselinux
+Requires: libselinux-python3
 Requires: python3-rpm >= %{rpmver}
 Requires: python3-pyparted >= %{pypartedver}
 Requires: python3-requests
@@ -128,8 +125,6 @@ Requires: NetworkManager-team
 %endif
 %ifarch s390 s390x
 Requires: openssh
-Requires: s390utils-core >= %{s390utilscorever}
-Requires: dracut-network >= %{dracutver}
 %endif
 Requires: NetworkManager >= %{nmver}
 Requires: NetworkManager-libnm >= %{nmver}
@@ -143,9 +138,9 @@ Requires: python3-pid
 
 # Required by the systemd service anaconda-fips.
 Requires: crypto-policies
-Requires: crypto-policies-scripts
+Requires: /usr/bin/update-crypto-policies
 
-# required because of the rescue mode and RDP question
+# required because of the rescue mode and VNC question
 Requires: anaconda-tui = %{version}-%{release}
 
 # Make sure we get the en locale one way or another
@@ -166,6 +161,7 @@ Obsoletes: anaconda-images <= 10
 Provides: anaconda-images = %{version}-%{release}
 Obsoletes: anaconda-runtime < %{version}-%{release}
 Provides: anaconda-runtime = %{version}-%{release}
+Obsoletes: booty <= 0.107-1
 
 %description core
 The anaconda-core package contains the program which was used to install your
@@ -181,6 +177,7 @@ BuildRequires: desktop-file-utils
 # live installation currently implies a graphical installation
 Requires: anaconda-gui = %{version}-%{release}
 Requires: zenity
+Requires: xisxwayland
 Recommends: xhost
 
 %description live
@@ -199,11 +196,11 @@ Requires: libblockdev-lvm-dbus
 # active directory/freeipa join support
 Requires: realmd
 Requires: isomd5sum >= %{isomd5sumver}
-%ifarch x86_64
+%ifarch %{ix86} x86_64
 Recommends: fcoe-utils >= %{fcoeutilsver}
 %endif
 # likely HFS+ resize support
-%ifarch x86_64
+%ifarch %{ix86} x86_64
 %if ! 0%{?rhel}
 Requires: hfsplus-tools
 %endif
@@ -245,7 +242,7 @@ Summary: Installation image specific dependencies
 # Pull in most stuff with the -env- metapackage
 Requires: anaconda-install-env-deps = %{version}-%{release}
 # Require storage things that are only recommended in -env-
-%ifarch x86_64
+%ifarch %{ix86} x86_64
 Requires: fcoe-utils >= %{fcoeutilsver}
 %endif
 # only WeakRequires elsewhere and not guaranteed to be present
@@ -260,19 +257,16 @@ Requires: zram-generator
 # needed for proper driver disk support - if RPMs must be installed, a repo is needed
 Requires: createrepo_c
 # Display stuff moved from lorax templates
+Requires: xorg-x11-drivers
+Requires: xorg-x11-server-Xorg
+Requires: xrandr
+Requires: xrdb
+Requires: dbus-x11
 Requires: gsettings-desktop-schemas
 Requires: nm-connection-editor
 Requires: librsvg2
 Requires: gnome-kiosk
-Requires: gnome-remote-desktop
-# needed to generate RDP certs at runtime
-Requires: openssl
-# needed by GNOME kiosk but not declared a as explicit dep,
-# instead expected to be declared like this according to the
-# maintainers
-Requires: mesa-dri-drivers
 Requires: brltty
-Requires: python3-pam
 # dependencies for rpm-ostree payload module
 Requires: rpm-ostree >= %{rpmostreever}
 Requires: ostree
@@ -297,6 +291,8 @@ Requires: python3-meh-gui >= %{mehver}
 Requires: python3-xkbregistry
 Requires: adwaita-icon-theme
 Requires: tecla
+Requires: tigervnc-server-minimal
+Requires: libxklavier >= %{libxklavierver}
 Requires: nm-connection-editor
 %ifnarch s390 s390x
 Requires: NetworkManager-wifi
@@ -308,8 +304,6 @@ Requires: system-logos
 
 # Needed to compile the gsettings files
 BuildRequires: gsettings-desktop-schemas
-# Needed for gdbus-codegen
-BuildRequires: glib2-devel
 
 %description gui
 This package contains graphical user interface for the Anaconda installer.
@@ -416,7 +410,6 @@ rm -rf \
 %{_sbindir}/anaconda
 %{_sbindir}/handle-sshpw
 %{_datadir}/anaconda
-%config(noreplace) %{_sysconfdir}/pam.d/anaconda
 %{_prefix}/libexec/anaconda
 %exclude %{_datadir}/anaconda/gnome
 %exclude %{_datadir}/anaconda/pixmaps
@@ -431,15 +424,12 @@ rm -rf \
 %exclude %{python3_sitearch}/pyanaconda/ui/gui/*
 %exclude %{python3_sitearch}/pyanaconda/ui/tui/*
 %{_bindir}/anaconda-cleanup
-# Installer configuration files aren’t updated post-installation,
-# so the noreplace flag doesn't offer a practical benefit in this context.
-# It is added to silence the rpmlint conffile-without-noreplace-flag warning.
 %dir %{_sysconfdir}/%{name}
-%config(noreplace) %{_sysconfdir}/%{name}/*
+%config %{_sysconfdir}/%{name}/*
 %dir %{_sysconfdir}/%{name}/conf.d
-%config(noreplace) %{_sysconfdir}/%{name}/conf.d/*
+%config %{_sysconfdir}/%{name}/conf.d/*
 %dir %{_sysconfdir}/%{name}/profile.d
-%config(noreplace) %{_sysconfdir}/%{name}/profile.d/*
+%config %{_sysconfdir}/%{name}/profile.d/*
 
 %if %{with live}
 # do not provide the live subpackage on RHEL
@@ -450,7 +440,7 @@ rm -rf \
 %{_libexecdir}/liveinst-setup.sh
 %{_datadir}/applications/*.desktop
 %{_datadir}/anaconda/gnome
-%config(noreplace) %{_sysconfdir}/xdg/autostart/*.desktop
+%{_sysconfdir}/xdg/autostart/*.desktop
 
 %endif
 
@@ -492,148 +482,14 @@ rm -rf \
 %{_prefix}/libexec/anaconda/dd_*
 
 %changelog
-* Fri Nov 08 2024 Packit <hello@packit.dev> - 42.13-1
+* Thu Oct 17 2024 Packit <hello@packit.dev> - 41.35-1
-- Test for kickstart scripts (akankovs)
-- Migrate the %%pre-install, %%post, %%onerror and %%traceback scripts
-  (akankovs)
-- Suppress warning from systemd user session (jkonecny)
-- Use log levels when getting logs from GLib (jkonecny)
-- Remove GLib logging condition for HW logging (jkonecny)
-- Move GLib imports to pyanaconda.core.glib (jkonecny)
-- Redirect only GLib loggers to Journal (mkolman)
-- docs: Collect release notes for F41 (k.koukiou)
-- pyanaconda: storage: workaround for Virtio Block Device being displayed as
-  0x1af4 (k.koukiou)
-
-* Fri Oct 25 2024 Packit <hello@packit.dev> - 42.12-1
-- Revert "Update lorax build for pkexec command" (k.koukiou)
-- Update lorax build for pkexec command (adamkankovsky)
-- webui: Handle XAUTHORITY and XDG_RUNTIME_DIR (rstrode)
-- unit_test: extend existing device tree checks with isleaf attribute
-  (adamkankovsky)
-- Introduce isleaf to deviceData (adamkankovsky)
-- network: handle autoconnections policy for rhel upstream (rvykydal)
-
-* Wed Oct 23 2024 Packit <hello@packit.dev> - 42.11-1
-- Fix permission errors from liveinst exit (jkonecny)
-- Remove redundant line in DNF payload (mkolman)
-- Fix vconsole layout doesn't work for ostree (jkonecny)
 - Fix checking whether a disk can be cleared during autopart (vtrefny)
-- Update spec config files list (ppolawsk)
-- Update makefile clean file list with RPMs (ppolawsk)
 
-* Tue Oct 22 2024 Packit <hello@packit.dev> - 42.10-1
+* Thu Sep 26 2024 Packit <hello@packit.dev> - 41.34-1
-- Fix crash on continue after a missing package non-critical error (mkolman)
-
-* Wed Oct 16 2024 Packit <hello@packit.dev> - 42.9-1
-- Log stderr to journal only on supported platforms (jkonecny)
-- logging: fix the length limit of packages info dbg message (rvykydal)
-
-* Tue Oct 15 2024 Gwyn Ciesla <gwync@protonmail.com> - 42.8-2
-- brltty rebuild
-
-* Tue Oct 15 2024 Packit <hello@packit.dev> - 42.8-1
-- Fix journal redirect on systems without journal (jkonecny)
-- unit_tests: drop DASDDevice.opts like in related blivet change (maier)
-- network: use consolidated s390 device configuration (#1802482,#1937049)
-  (maier)
-- write persistent config of any (dasd,zfcp,znet) s390 devices to sysroot
-  (#1802482,#1937049) (maier)
-- DASDDiscoverTask: use consolidated device configuration with zdev
-  (#1802482,#1937049) (maier)
-
-* Thu Oct 10 2024 Packit <hello@packit.dev> - 42.7-1
-- Add GRD test coverage (jkonecny)
-- Improve docs in gnome_remote_desktop source (jkonecny)
-- Check return values from GRD calls (jkonecny)
-- Create a shortcut method for GRD failure (jkonecny)
-- Obtain hostname for RDP asynchronously (jkonecny)
-- Print connect info after starting GRD server (jkonecny)
-- Fix starting anaconda on z/VM and LPAR s390x (jstodola)
-- Create GRDServer class only when required (jkonecny)
-- Disable fedora-cisco repository in our containers (jkonecny)
-- Fix typo in the GRD source file name (jkonecny)
-- Do not change compositor options when not defined (jkonecny)
-- Add release-notes for Wayland migration (jkonecny)
-- Set --rdp in liveinst unsupported (jkonecny)
-- Remove Wayland detection logic from code (jkonecny)
-- Do not create GRDServer on Live ISO (jkonecny)
-- Remove dead spice_vd_agent code (jkonecny)
-- Switch keyboard management to Localed (jkonecny)
-- Add localed signal support to LocaledWrapper (jkonecny)
-- Add missing support to localed for compositor (jkonecny)
-- Redirect output of various GNOME related tools to Journal (mkolman)
-- Remove leftover debugging message (mkolman)
-- Redirect Anaconda main process stderr to Journal (mkolman)
-- Cleanup remaining Xorg and VNC references and dead code (mkolman)
-- Handle inst.rdp in Dracut (mkolman)
-- Adjust to freerdp and GNOME package changes (mkolman)
-- Replace VNC support with GNOME remote desktop (mkolman)
-- Add RDP boot options & deprecate VNC boot options (mkolman)
-- Introduce GNOME remote desktop support (mkolman)
-- Rename usevnc flag & similar variables (mkolman)
-- Drop xrdb (jexposit)
-- Drop xrandr (jexposit)
-- Add unit tests for GkKeyboardManager and its API in localization module
-  (rvykydal)
-- Drop the X.Org server dependency (jexposit)
-- Drop libxklavier (jexposit)
-- Use GNOME Kiosk's API in LayoutIndicator (jexposit)
-- Setup gdbus-codegen (jexposit)
-- Use GNOME Kiosk's API in XklWrapper (jexposit)
-- Add GNOME Kiosk keyboard manager class (jexposit)
-- home reuse: add unit tests (rvykydal)
-- home reuse: define static and class methods (rvykydal)
-- home reuse: reuse mount options of reused mountpoins (rvykydal)
-- home reuse: check autopartitioning scheme against reused mountpoints
-  (rvykydal)
-- home reuse: require removing of bootloader partition explicitly (rvykydal)
-- home reuse: remove bootloader partitions implicitly (rvykydal)
-- home reuse: update existing OSs when applying partitioning (rvykydal)
-- home reuse: add support for /home reuse to automatic partitioning (rvykydal)
-
-* Tue Oct 08 2024 Packit <hello@packit.dev> - 42.6-1
-- Update to version 42.6
-
-* Tue Oct 01 2024 Packit <hello@packit.dev> - 42.5-1
-- docs: Adjust CONTRIBUTING document to mention automatic linter checks
-  (k.koukiou)
-- docs: rule is covered by pylint (k.koukiou)
-- docs: rule is covered by pylint (k.koukiou)
-- Update tests for patition device data (adamkankovsky)
-- build: remove the Obsoletes line from the spec file for booty (k.koukiou)
-- build: fix: anaconda-core-debuginfo.x86_64: E: no-binary (k.koukiou)
-- build: fix: anaconda-core.x86_64: E: explicit-lib-dependency libselinux-
-  python3 (k.koukiou)
-- Take partition label from blivet (akankovs)
-- Update test for comunicate (akankovs)
-- webui: Saving webui-desktop log to anaconda.log (akankovs)
-
-* Tue Sep 24 2024 Packit <hello@packit.dev> - 42.4-1
-- pyanaconda: fix incorrect access to --repo argument (k.koukiou)
-- util: log PID also when a created process terminates (k.koukiou)
-- Add release notes about dropping i686 builds (jkonecny)
-- Remove support for i686 builds (jkonecny)
-- Remove deprecated `method` boot option (k.koukiou)
-- configure: only append -fanalyzer when building with gcc (zhoujiacheng)
-- Fix check for biosboot partition in GRUB2.check (vtrefny)
-
-* Tue Sep 17 2024 Packit <hello@packit.dev> - 42.3-1
 - Fix scheduling actions in reclaim space dialog (#2311936) (vtrefny)
 
-* Tue Sep 10 2024 Packit <hello@packit.dev> - 42.2-1
+* Mon Sep 23 2024 Packit <hello@packit.dev> - 41.33-1
-- security: call /usr/libexec/fips-setup-helper (asosedkin)
+- New version - 41.33 (k.koukiou)
-
-* Thu Sep 05 2024 Adam Williamson <awilliam@redhat.com> - 42.1-2
-- Rebuild to get a combined update with anaconda-webui
-
-* Mon Sep 02 2024 Packit <hello@packit.dev> - 42.1-1
-- Ignore all storage errors when trying to activate swaps (vtrefny)
-- build: stop pulling systemd as build dependency (kkoukiou)
-- webui: Move webui-desktop in libexec to our subdirectory (akankovs)
-
-* Tue Aug 27 2024 Packit <hello@packit.dev> - 41.32-1
-- Update to version 41.32
 
 * Thu Aug 22 2024 Packit <hello@packit.dev> - 41.31-1
 - docs: update release note about modularity deprecation (kkoukiou)

spec_files/anaconda/bazzite.patch

@@ -1,19 +1,20 @@
 diff -Naur a/pyanaconda/display.py b/pyanaconda/display.py
 --- a/pyanaconda/display.py
 +++ b/pyanaconda/display.py
-@@ -391,6 +391,13 @@
+@@ -237,6 +237,14 @@
-         if not anaconda.gui_startup_failed:
+     :param str runres: a resolution specification string
-             if options.runres and anaconda.gui_mode and not flags.use_rd:
+     :param gui_mode: an Anaconda display mode
-                 def on_mutter_ready(observer):
+     """
-+                    # Get product name
-+                    with open("/sys/devices/virtual/dmi/id/product_name") as f:
-+                        dmi = f.read().strip()
 +
-+                    if "Jupiter" in dmi or "Galileo" in dmi or "NEXT" in dmi:
++    # Get product name
-+                        options.runres = "1280x800"
++    with open("/sys/devices/virtual/dmi/id/product_name") as f:
++        dmi = f.read().strip()
 +
-                     set_resolution(options.runres)
++    if "Jupiter" in dmi or "Galileo" in dmi or "NEXT" in dmi:
-                     observer.disconnect()
++        runres = "1280x800"
++
+     if runres and gui_mode and not flags.usevnc:
+         set_x_resolution(runres)
  
 diff -Naur a/pyanaconda/ui/gui/__init__.py b/pyanaconda/ui/gui/__init__.py
 --- a/pyanaconda/ui/gui/__init__.py

spec_files/mesa/mesa.spec

@@ -197,7 +197,7 @@ Obsoletes:      mesa-omx-drivers < %{?epoch:%{epoch}:}%{version}-%{release}
 Summary:        Mesa libGL runtime libraries
 Requires:       %{name}-libglapi%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:       libglvnd-glx%{?_isa} >= 1:1.3.2
-Recommends:     %{name}-dri-drivers%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{orig_release}
+Recommends:     %{name}-dri-drivers%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description libGL
 %{summary}.
@@ -218,7 +218,7 @@ Summary:        Mesa libEGL runtime libraries
 Requires:       libglvnd-egl%{?_isa} >= 1:1.3.2
 Requires:       %{name}-libgbm%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:       %{name}-libglapi%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
-Recommends:     %{name}-dri-drivers%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{orig_release}
+Recommends:     %{name}-dri-drivers%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description libEGL
 %{summary}.
@@ -287,11 +287,11 @@ Requires:       %{name}-libOSMesa%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{rele
 Summary:        Mesa gbm runtime library
 Provides:       libgbm
 Provides:       libgbm%{?_isa}
-Recommends:     %{name}-dri-drivers%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{orig_release}
+Recommends:     %{name}-dri-drivers%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
 # If mesa-dri-drivers are installed, they must match in version. This is here to prevent using
 # older mesa-dri-drivers together with a newer mesa-libgbm and its dependants.
 # See https://bugzilla.redhat.com/show_bug.cgi?id=2193135 .
-Requires:       (%{name}-dri-drivers%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{orig_release} if %{name}-dri-drivers%{?_isa})
+Requires:       (%{name}-dri-drivers%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} if %{name}-dri-drivers%{?_isa})
 
 %description libgbm
 %{summary}.
@@ -328,11 +328,10 @@ Provides:       libxatracker-devel%{?_isa}
 Summary:        Mesa shared glapi
 Provides:       libglapi
 Provides:       libglapi%{?_isa}
-Provides:       libglapi%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{orig_release} if %{name}-dri-drivers%{?_isa})
 # If mesa-dri-drivers are installed, they must match in version. This is here to prevent using
 # older mesa-dri-drivers together with a newer mesa-libglapi or its dependants.
 # See https://bugzilla.redhat.com/show_bug.cgi?id=2193135 .
-Requires:       (%{name}-dri-drivers%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{orig_release} if %{name}-dri-drivers%{?_isa})
+Requires:       (%{name}-dri-drivers%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} if %{name}-dri-drivers%{?_isa})
 
 %description libglapi
 %{summary}.