From 72e0c1529ce1cbfacd306a6cf80361f5fd7762b23b98baaf2a498865945ef813 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= <bjorn.lie@gmail.com>
Date: Tue, 7 Dec 2021 10:17:05 +0000
Subject: [PATCH] Accepting request 932658 from home:gmbr3:Active

- Change to systemd-sysusers

OBS-URL: https://build.opensuse.org/request/show/932658
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/colord?expand=0&rev=180
---
 colord.changes  |  5 +++++
 colord.spec     | 14 ++++++++------
 colord.sysusers |  2 ++
 3 files changed, 15 insertions(+), 6 deletions(-)
 create mode 100644 colord.sysusers

diff --git a/colord.changes b/colord.changes
index ca8b5b1..52844b1 100644
--- a/colord.changes
+++ b/colord.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sat Nov 20 15:53:00 UTC 2021 - Callum Farmer <gmbr3@opensuse.org>
+
+- Change to systemd-sysusers
+
 -------------------------------------------------------------------
 Thu Jan 14 13:00:13 UTC 2021 - Christian Boltz <suse-beta@cboltz.de>
 
diff --git a/colord.spec b/colord.spec
index a975f57..2f7e8df 100644
--- a/colord.spec
+++ b/colord.spec
@@ -30,6 +30,7 @@ Source1:        https://www.freedesktop.org/software/colord/releases/%{name}-%{v
 Source2:        %{name}.keyring
 # Apparmor profile
 Source3:        usr.lib.colord
+Source4:        colord.sysusers
 Source99:       baselibs.conf
 
 BuildRequires:  argyllcms
@@ -37,6 +38,7 @@ BuildRequires:  docbook5-xsl-stylesheets
 BuildRequires:  gobject-introspection-devel
 BuildRequires:  gtk-doc
 BuildRequires:  meson
+BuildRequires:  sysuser-tools
 BuildRequires:  pkgconfig
 BuildRequires:  pkgconfig(bash-completion) >= 2.0
 BuildRequires:  pkgconfig(dbus-1)
@@ -57,7 +59,7 @@ BuildRequires:  pkgconfig(udev)
 BuildRequires:  pkgconfig(vapigen)
 Requires:       argyllcms
 Requires:       colord-color-profiles
-Requires(pre):  pwdutils
+%sysusers_requires
 %{?systemd_requires}
 
 %description
@@ -143,6 +145,7 @@ there are no users logged in.
 %autosetup -p1
 
 %build
+%sysusers_generate_pre %{SOURCE4} %{name} %{name}.conf
 # Set ~2 GiB limit so that colprof is forced to work in chunks when
 # generating the print profile rather than trying to allocate a 3.1 GiB
 # chunk of RAM to put the entire B-to-A tables in.
@@ -178,16 +181,14 @@ find %{buildroot} -type f -name "*.la" -delete -print
 # Install Apparmor profile
 mkdir -p %{buildroot}%{_sysconfdir}/apparmor.d/
 install -c -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/apparmor.d/
+
+install -Dm0644 %{SOURCE4} %{buildroot}%{_sysusersdir}/%{name}.conf
 %find_lang %{name}
 
-%pre
-# Create colord user
-getent group colord >/dev/null || groupadd -r colord
-getent passwd colord >/dev/null || useradd -r -g colord -d %{_localstatedir}/lib/colord -s /sbin/nologin -c "user for colord" colord
+%pre -f %{name}.pre
 %service_add_pre %{name}.service
 # Fix ownership of /var/lib/colord from first packages (in 12.1)
 test ! -d %{_localstatedir}/lib/colord || chown -R colord:colord %{_localstatedir}/lib/colord
-exit 0
 
 %preun
 %service_del_preun %{name}.service
@@ -207,6 +208,7 @@ exit 0
 %license COPYING
 %doc AUTHORS NEWS
 %{_unitdir}/colord.service
+%{_sysusersdir}/%{name}.conf
 %{_udevrulesdir}/*.rules
 %attr(755,colord,colord) %dir %{_localstatedir}/lib/colord
 %{_datadir}/bash-completion/completions/colormgr
diff --git a/colord.sysusers b/colord.sysusers
new file mode 100644
index 0000000..677c55c
--- /dev/null
+++ b/colord.sysusers
@@ -0,0 +1,2 @@
+#Type Name   ID GECOS             Home directory  Shell
+u     colord -  "user for colord" /var/lib/colord -