From ae9bf6fba8ccaacbe6e567882accc9f8942d7f39 Mon Sep 17 00:00:00 2001 From: eabdullin Date: Fri, 14 Nov 2025 14:06:12 +0000 Subject: [PATCH] import CS gnome-initial-setup-46.7-2.el10 --- gnome-initial-setup.spec | 15 +++++++++------ gnome-initial-setup.sysusers.conf | 1 + 2 files changed, 10 insertions(+), 6 deletions(-) create mode 100644 gnome-initial-setup.sysusers.conf diff --git a/gnome-initial-setup.spec b/gnome-initial-setup.spec index 391af36..5d97e8d 100644 --- a/gnome-initial-setup.spec +++ b/gnome-initial-setup.spec @@ -2,7 +2,7 @@ ## (rpmautospec version 0.6.5) ## RPMAUTOSPEC: autorelease, autochangelog %define autorelease(e:s:pb:n) %{?-p:0.}%{lua: - release_number = 1; + release_number = 2; base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}")); print(release_number + base_release_number - 1); }%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}} @@ -32,6 +32,7 @@ License: GPL-2.0-or-later URL: https://wiki.gnome.org/Design/OS/InitialSetup Source0: https://download.gnome.org/sources/%{name}/46/%{name}-%{tarball_version}.tar.xz Source1: vendor.conf +Source2: gnome-initial-setup.sysusers.conf # Downstream branding Patch: 0001-RHEL10-style-illustrations.patch @@ -65,6 +66,7 @@ BuildRequires: pkgconfig(pango) BuildRequires: pkgconfig(polkit-gobject-1) BuildRequires: pkgconfig(pwquality) BuildRequires: pkgconfig(rest-1.0) +BuildRequires: systemd-rpm-macros %if %{with webkitgtk} BuildRequires: pkgconfig(webkitgtk-6.0) %endif @@ -78,7 +80,7 @@ Requires: gnome-desktop4%{?_isa} >= %{gnome_desktop_version} Requires: polkit-js-engine Requires: /usr/bin/tecla -Requires(pre): shadow-utils +%{?sysusers_requires_compat} Provides: user(%name) @@ -114,10 +116,8 @@ cp %{SOURCE1} %{buildroot}%{_datadir}/gnome-initial-setup/ %find_lang %{name} %pre -# we do not use sysusers yet because we need /var/lib/gnome-initial-setup -# to be owned by the gnome-initial-setup user. please do not convert -# to sysusers without making sure this is handled, maybe by tmpfiles -useradd -rM -d /run/gnome-initial-setup/ -s /sbin/nologin %{name} &>/dev/null || : +%sysusers_create_compat %{SOURCE2} + %files -f %{name}.lang %license COPYING @@ -139,6 +139,9 @@ useradd -rM -d /run/gnome-initial-setup/ -s /sbin/nologin %{name} &>/dev/null || %changelog ## START: Generated by rpmautospec +* Wed Sep 03 2025 Tomas Pelka - 46.7-2 +- Use systemd sysusers config to create user and group + * Mon Mar 17 2025 Michael Catanzaro - 46.7-1 - Update to 46.7 diff --git a/gnome-initial-setup.sysusers.conf b/gnome-initial-setup.sysusers.conf new file mode 100644 index 0000000..b61480f --- /dev/null +++ b/gnome-initial-setup.sysusers.conf @@ -0,0 +1 @@ +u gnome-initial-setup - - /run/gnome-initial-setup/ /sbin/nologin