new version

Default initial-setup-gui GDK to X11 for all display servers (ales.astone)
Configure a seat session for running wayland compositors (ales.astone)
Add support for generic Wayland support through Weston (neal)
Allow running the graphical setup in graphic servers other than Xorg (ales.astone)
windowmanager: Remove kwin (ales.astone)

.gitignore

@@ -95,3 +95,4 @@
 /initial-setup-0.3.96.tar.gz
 /initial-setup-0.3.97.tar.gz
 /initial-setup-0.3.98.tar.gz
+/initial-setup-0.3.99.tar.gz

initial-setup.spec

@@ -1,9 +1,8 @@
-Name: initial-setup
-Version: 0.3.98
-Release: 2%{?dist}
 Summary: Initial system configuration utility
+Name: initial-setup
 URL: https://fedoraproject.org/wiki/InitialSetup
-License: GPL-2.0-or-later
+Version: 0.3.99
+Release: 1%{?dist}
 
 # This is a Red Hat maintained package which is specific to
 # our distribution.
@@ -16,6 +15,7 @@ Source0: %{name}-%{version}.tar.gz
 %define debug_package %{nil}
 %define anacondaver 37.8-1
 
+License: GPL-2.0-or-later
 BuildRequires: gettext
 BuildRequires: python3-devel
 BuildRequires: python3-setuptools
@@ -27,7 +27,6 @@ BuildRequires: make
 
 Requires: %{__python3}
 Requires: anaconda-tui >= %{anacondaver}
-Requires: libxkbcommon
 Requires: python3-simpleline >= 1.4
 Requires: systemd >= 235
 Requires(post): systemd
@@ -44,15 +43,42 @@ a series of steps that allows for easier configuration of the machine.
 Summary: Graphical user interface for the initial-setup utility
 Requires: gtk3
 Requires: anaconda-gui >= %{anacondaver}
-Requires: firstboot(windowmanager)
+Requires: firstboot(gui-backend)
-Requires: xorg-x11-xinit
-Requires: xorg-x11-server-Xorg
 Requires: %{name} = %{version}-%{release}
+Suggests: %{name}-gui-wayland-generic
 
 %description gui
 The initial-setup-gui package contains a graphical user interface for the
 initial-setup utility.
 
+%package gui-xorg
+Summary: Run the initial-setup GUI in Xorg
+Requires: %{name}-gui = %{version}-%{release}
+Requires: xorg-x11-xinit
+Requires: xorg-x11-server-Xorg
+Requires: libxkbcommon
+Requires: firstboot(windowmanager)
+
+Provides:  firstboot(gui-backend)
+Conflicts: firstboot(gui-backend)
+RemovePathPostfixes: .guixorg
+
+%description gui-xorg
+%{summary}.
+
+%package gui-wayland-generic
+Summary: Run the initial-setup GUI in Wayland
+Requires: %{name}-gui = %{version}-%{release}
+Requires: weston
+Requires: xorg-x11-server-Xwayland
+
+Provides:  firstboot(gui-backend)
+Conflicts: firstboot(gui-backend)
+RemovePathPostfixes: .guiweston
+
+%description gui-wayland-generic
+%{summary}.
+
 %prep
 %autosetup -p 1
 
@@ -60,13 +86,20 @@ initial-setup utility.
 rm -rf *.egg-info
 
 %build
-%make_build
+make
 
 %install
-%make_install
+rm -rf %{buildroot}
+make DESTDIR=%{buildroot} install
+
+# Remove the default link, provide subpackages for alternatives
+rm %{buildroot}%{_libexecdir}/%{name}/run-gui-backend
 
 %find_lang %{name}
 
+%clean
+rm -rf %{buildroot}
+
 %post
 %systemd_post initial-setup.service
 
@@ -77,12 +110,11 @@ rm -rf *.egg-info
 %systemd_postun initial-setup.service
 
 %files -f %{name}.lang
-%license COPYING
 %doc README.rst ChangeLog
+%license COPYING
 %{python3_sitelib}/initial_setup*
 %exclude %{python3_sitelib}/initial_setup/gui
 %{_libexecdir}/%{name}/run-initial-setup
-%{_libexecdir}/%{name}/firstboot-windowmanager
 %{_libexecdir}/%{name}/initial-setup-text
 %{_libexecdir}/%{name}/reconfiguration-mode-enabled
 %{_unitdir}/initial-setup.service
@@ -90,6 +122,7 @@ rm -rf *.egg-info
 %dir %{_sysconfdir}/%{name}
 %dir %{_sysconfdir}/%{name}/conf.d
 %config %{_sysconfdir}/%{name}/conf.d/*
+%{_sysconfdir}/pam.d/initial-setup
 
 %ifarch s390 s390x
 %{_sysconfdir}/profile.d/initial-setup.sh
@@ -100,16 +133,24 @@ rm -rf *.egg-info
 %{_libexecdir}/%{name}/initial-setup-graphical
 %{python3_sitelib}/initial_setup/gui/
 
+%files gui-xorg
+%{_libexecdir}/%{name}/run-gui-backend.guixorg
+%{_libexecdir}/%{name}/firstboot-windowmanager
+
+%files gui-wayland-generic
+%{_libexecdir}/%{name}/run-gui-backend.guiweston
+
 %changelog
-* Tue Oct 17 2023 Martin Kolman <mkolman@redhat.com> - 0.3.98-2
+* Wed Jan 03 2024 Martin Kolman <mkolman@redhat.com> - 0.3.99-1
-- Fix tarball (#2241274) (mkolman)
+- Default initial-setup-gui GDK to X11 for all display servers (ales.astone)
+- Configure a seat session for running wayland compositors (ales.astone)
+- Add support for generic Wayland support through Weston (neal)
+- Allow running the graphical setup in graphic servers other than Xorg (ales.astone)
+- windowmanager: Remove kwin (ales.astone)
 
 * Mon Oct 09 2023 Martin Kolman <mkolman@redhat.com> - 0.3.98-1
 - Fix Anaconda module startup (#2241274) (mkolman)
 
-* Sat Sep 09 2023 Peter Robinson <pbrobinson@fedoraproject.org> - 0.3.97-4
-- Requires libxkbcommon, minor spec modernisation
-
 * Mon Feb 13 2023 Martin Kolman <mkolman@redhat.com> - 0.3.97-1
 - Make it possible to run with no kickstart (mkolman)
 - Fixup packit SRPM build deps (mkolman)

sources

@@ -1 +1 @@
-SHA512 (initial-setup-0.3.98.tar.gz) = fc5a7f2a2e4fe1d7e46a94868271de0ac6d026edd21ecac0d498c151ef0736fe65d5a0151601083599082cf10000b9cfb1fdbd506b447a9d5522af607d4ed6dd
+SHA512 (initial-setup-0.3.99.tar.gz) = 411d2c45e8cab8a9ad09b4541f510131fa1934b43edcadec23ce9d1e1fbcc19e5da72990ea68f98ea7adbbd08b8898815667905988bcb351b43b83e90604432a