From f8036e324fd387bdeb1bd8fc30d82a83ad0d045b Mon Sep 17 00:00:00 2001 From: tigro Date: Tue, 24 Dec 2024 23:45:00 +0300 Subject: [PATCH] import initial-setup-0.3.101-1.1.el10 --- .gitignore | 2 +- .initial-setup.metadata | 2 +- SPECS/initial-setup.spec | 193 +++++++++++++++++++++++++++++---------- 3 files changed, 146 insertions(+), 51 deletions(-) diff --git a/.gitignore b/.gitignore index ff00375..11557a0 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/initial-setup-0.3.90.2.tar.gz +SOURCES/initial-setup-0.3.101.tar.gz diff --git a/.initial-setup.metadata b/.initial-setup.metadata index 650f23c..5b1c26c 100644 --- a/.initial-setup.metadata +++ b/.initial-setup.metadata @@ -1 +1 @@ -8ce20a36d51b740faf5f20effdffdf1f44218a6c SOURCES/initial-setup-0.3.90.2.tar.gz +e5eff25e0c019cf28dee4174498bd9032f6c5da4 SOURCES/initial-setup-0.3.101.tar.gz diff --git a/SPECS/initial-setup.spec b/SPECS/initial-setup.spec index 05d5778..7e9db29 100644 --- a/SPECS/initial-setup.spec +++ b/SPECS/initial-setup.spec @@ -1,8 +1,12 @@ -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.90.2 -Release: 2%{?dist} +License: GPL-2.0-or-later +Version: 0.3.101 +Release: 1.1%{?dist} # This is a Red Hat maintained package which is specific to # our distribution. @@ -13,20 +17,19 @@ Release: 2%{?dist} Source0: %{name}-%{version}.tar.gz %define debug_package %{nil} -%define anacondaver 34.9-1 +%define anacondaver 37.8-1 -License: GPLv2+ BuildRequires: gettext BuildRequires: python3-devel BuildRequires: python3-setuptools BuildRequires: systemd-units BuildRequires: gtk3-devel -BuildRequires: glade-devel BuildRequires: intltool BuildRequires: make Requires: %{__python3} Requires: anaconda-tui >= %{anacondaver} +Requires: libxkbcommon Requires: python3-simpleline >= 1.4 Requires: systemd >= 235 Requires(post): systemd @@ -39,37 +42,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(windowmanager) -Requires: xorg-x11-xinit -Requires: xorg-x11-server-Xorg -Requires: %{name} = %{version}-%{release} - -%description gui -The initial-setup-gui package contains a graphical user interface for the -initial-setup utility. - -%prep -%autosetup -p 1 - -# remove upstream egg-info -rm -rf *.egg-info - -%build -make - -%install -rm -rf %{buildroot} -make DESTDIR=%{buildroot} install - -%find_lang %{name} - -%clean -rm -rf %{buildroot} - %post %systemd_post initial-setup.service @@ -85,7 +57,6 @@ rm -rf %{buildroot} %{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 @@ -93,28 +64,152 @@ rm -rf %{buildroot} %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 %{_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/* +%{python3_sitelib}/initial_setup/gui/ -%changelog -* Mon Aug 09 2021 Mohan Boddu - 0.3.90.2-2 -- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags - Related: rhbz#1991688 +# -------------------------------------------------------------------------- + +%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 -* Fri Jun 11 2021 Martin Kolman - 0.3.90.2-1 -- Disable multi TTY handler when running in SSH session (#1951577) (mkolman) - Resolves: rhbz#1951577 +%build +%make_build + +%install +%make_install -* Thu Jun 10 2021 Martin Kolman - 0.3.90.1-1 -- Add gnome-kiosk to window managers usable by initial-setup (#1962198) (vponcova) - Resolves: rhbz#1962198 +# 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 +* Tue Dec 24 2024 Arkady L. Shane - 0.3.101-1.1 +- Rebuilt for MSVSphere 10 + +* Wed Dec 18 2024 Troy Dawson - 0.3.101-1.1 +- glade is no longer needed for building, remove build dependency + +* Fri Jul 19 2024 Martin Kolman - 0.3.101-1 +- Use threads.py submodule in favor of compatibility file threading.py (kkoukiou) + +* 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) +- 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 - 0.3.98-1 +- Fix Anaconda module startup (#2241274) (mkolman) + +* Mon Feb 13 2023 Martin Kolman - 0.3.97-1 +- Make it possible to run with no kickstart (mkolman) +- Fixup packit SRPM build deps (mkolman) + +* Thu Jan 19 2023 Martin Kolman - 0.3.96-1 +- SPDX compatible License: line (mkolman) +- Fixup version in setup.py (mkolman) + +* Wed Jul 20 2022 Martin Kolman - 0.3.95-1 +- Use Anaconda DBus read-write properties (vponcova) + +* Tue Oct 12 2021 Martin Kolman - 0.3.94-1 +- Remove the default_help_pages configuration option (vponcova) +- Add the configuration files to the updates image (vponcova) +- Remove the helpFile attribute (vponcova) +- Specify unique screen ids (vponcova) +- Apply suggestions from code review (martin.kolman) +- Fix ownership of the gui folder (#1812463) (mkolman) +- Don't show the EULA spoke if the license file doesn't exist (vponcova) + +* Mon Jul 12 2021 Martin Kolman - 0.3.93-1 +- Use profiles instead of product configuration files (vponcova) +- Change the Python version to 3.10 in the makeupdates script (vponcova) + +* Thu Jun 24 2021 Martin Kolman - 0.3.92-1 +- Fixup version in setup.py (mkolman) +- Add gnome-kiosk to window managers usable by initial-setup (rvykydal) +- Add copr builds also for branched Fedora (jkonecny) + +* Tue Apr 27 2021 Martin Kolman - 0.3.91-1 +- Disable multi TTY handler when running in SSH session (mkolman) +- Add CLI option to disable multi TTY handler (mkolman) * Tue Mar 30 2021 Martin Kolman - 0.3.90-1 - Remove old failing pre scriptlet (mkolman)