From 2006e19c5d4bd04c0593fdba51b1a7e56d415941 Mon Sep 17 00:00:00 2001 From: Martin Kolman Date: Wed, 3 Jan 2024 18:35:02 +0100 Subject: [PATCH] new version spec: Disable shipping the X11 backend for all but RHEL < 10 (neal) spec: Restructure and modernize (neal) --- .gitignore | 1 + initial-setup.spec | 153 +++++++++++++++++++++++++-------------------- sources | 2 +- 3 files changed, 88 insertions(+), 68 deletions(-) diff --git a/.gitignore b/.gitignore index 8df0ffd..be5e60b 100644 --- a/.gitignore +++ b/.gitignore @@ -96,3 +96,4 @@ /initial-setup-0.3.97.tar.gz /initial-setup-0.3.98.tar.gz /initial-setup-0.3.99.tar.gz +/initial-setup-0.3.100.tar.gz diff --git a/initial-setup.spec b/initial-setup.spec index 475efd0..4e610b8 100644 --- a/initial-setup.spec +++ b/initial-setup.spec @@ -1,7 +1,11 @@ -Summary: Initial system configuration utility +# Enable X11 for RHEL 9 and older only +%bcond x11 %[0%{?rhel} && 0%{?rhel} < 10] + Name: initial-setup +Summary: Initial system configuration utility URL: https://fedoraproject.org/wiki/InitialSetup -Version: 0.3.99 +License: GPL-2.0-or-later +Version: 0.3.100 Release: 1%{?dist} # This is a Red Hat maintained package which is specific to @@ -15,7 +19,6 @@ 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,6 +30,7 @@ BuildRequires: make Requires: %{__python3} Requires: anaconda-tui >= %{anacondaver} +Requires: libxkbcommon Requires: python3-simpleline >= 1.4 Requires: systemd >= 235 Requires(post): systemd @@ -39,67 +43,6 @@ Conflicts: firstboot < 19.2 The initial-setup utility runs after installation. It guides the user through a series of steps that allows for easier configuration of the machine. -%package gui -Summary: Graphical user interface for the initial-setup utility -Requires: gtk3 -Requires: anaconda-gui >= %{anacondaver} -Requires: firstboot(gui-backend) -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 - -# remove upstream egg-info -rm -rf *.egg-info - -%build -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 @@ -129,18 +72,94 @@ rm -rf %{buildroot} %{_sysconfdir}/profile.d/initial-setup.csh %endif +# -------------------------------------------------------------------------- + +%package gui +Summary: Graphical user interface for the initial-setup utility +Requires: gtk3 +Requires: anaconda-gui >= %{anacondaver} +Requires: firstboot(gui-backend) +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. + %files gui %{_libexecdir}/%{name}/initial-setup-graphical %{python3_sitelib}/initial_setup/gui/ -%files gui-xorg -%{_libexecdir}/%{name}/run-gui-backend.guixorg -%{_libexecdir}/%{name}/firstboot-windowmanager +# -------------------------------------------------------------------------- + +%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}. %files gui-wayland-generic %{_libexecdir}/%{name}/run-gui-backend.guiweston +# -------------------------------------------------------------------------- + +%if %{with x11} +%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: firstboot(windowmanager) + +Provides: firstboot(gui-backend) +Conflicts: firstboot(gui-backend) +RemovePathPostfixes: .guixorg + +%description gui-xorg +%{summary}. + +%files gui-xorg +%{_libexecdir}/%{name}/run-gui-backend.guixorg +%{_libexecdir}/%{name}/firstboot-windowmanager +%endif + +# -------------------------------------------------------------------------- + +%prep +%autosetup -p 1 + +# remove upstream egg-info +rm -rf *.egg-info + +%build +%make_build + +%install +%make_install + +# Remove the default link, provide subpackages for alternatives +rm %{buildroot}%{_libexecdir}/%{name}/run-gui-backend + +%if ! %{with x11} +# We do not want to ship X11 support anymore +rm -v %{buildroot}%{_libexecdir}/%{name}/run-gui-backend.guixorg +rm -v %{buildroot}%{_libexecdir}/%{name}/firstboot-windowmanager +%endif + +%find_lang %{name} + %changelog +* Wed Jan 03 2024 Martin Kolman - 0.3.100-1 +- spec: Disable shipping the X11 backend for all but RHEL < 10 (neal) +- spec: Restructure and modernize (neal) + * Wed Jan 03 2024 Martin Kolman - 0.3.99-1 - Default initial-setup-gui GDK to X11 for all display servers (ales.astone) - Configure a seat session for running wayland compositors (ales.astone) diff --git a/sources b/sources index 2515d77..f5b3c41 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (initial-setup-0.3.99.tar.gz) = 411d2c45e8cab8a9ad09b4541f510131fa1934b43edcadec23ce9d1e1fbcc19e5da72990ea68f98ea7adbbd08b8898815667905988bcb351b43b83e90604432a +SHA512 (initial-setup-0.3.100.tar.gz) = ac27a20c52d52a85402e54078ffd0815d546afc5123a9d549cf98cbc6bf13e403cb6929cedba0ff73a0e0d4101fc8d841e582c65f0b4614763379efe8fa3a1e7