rpms/colord
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Provide a sysusers.d file to get user() and group() provides

Browse Source
This commit is contained in:
Daan De Meyer 2023-10-01 21:19:59 +02:00
parent ebbfd1c0ad
commit 1f148330fe
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
colord.spec
View File

@ -10,10 +10,11 @@
Summary: Color daemon Summary: Color daemon
Name: colord Name: colord
Version: 1.4.6 Version: 1.4.6
Release: 6%{?dist} Release: 7%{?dist}
License: GPL-2.0-or-later AND LGPL-2.1-or-later License: GPL-2.0-or-later AND LGPL-2.1-or-later
URL: https://www.freedesktop.org/software/colord/ URL: https://www.freedesktop.org/software/colord/
Source0: https://www.freedesktop.org/software/colord/releases/%{name}-%{version}.tar.xz Source0: https://www.freedesktop.org/software/colord/releases/%{name}-%{version}.tar.xz
Source1: colord.sysusers
%if !0%{?rhel} %if !0%{?rhel}
BuildRequires: bash-completion BuildRequires: bash-completion
@ -42,9 +43,9 @@ BuildRequires: pkgconfig(sane-backends)
%endif %endif
Requires: color-filesystem Requires: color-filesystem
BuildRequires: systemd BuildRequires: systemd, systemd-rpm-macros
%{?systemd_requires} %{?systemd_requires}
Requires(pre): shadow-utils %{?sysusers_requires_compat}
Requires: colord-libs%{?_isa} = %{version}-%{release} Requires: colord-libs%{?_isa} = %{version}-%{release}
# Self-obsoletes to fix the multilib upgrade path # Self-obsoletes to fix the multilib upgrade path
@ -130,6 +131,7 @@ ulimit -Sv 2000000
%install %install
%meson_install %meson_install
install -Dpm 0644 %{SOURCE1} %{buildroot}%{_sysusersdir}/colord.conf
# databases # databases
touch $RPM_BUILD_ROOT%{_localstatedir}/lib/colord/mapping.db touch $RPM_BUILD_ROOT%{_localstatedir}/lib/colord/mapping.db
@ -138,11 +140,7 @@ touch $RPM_BUILD_ROOT%{_localstatedir}/lib/colord/storage.db
%find_lang %{name} %find_lang %{name}
%pre %pre
getent group colord >/dev/null || groupadd -r colord %sysusers_create_compat %{SOURCE1}
getent passwd colord >/dev/null || \
useradd -r -g colord -d /var/lib/colord -s /sbin/nologin \
-c "User for colord" colord
exit 0
%post %post
%systemd_post colord.service %systemd_post colord.service
@ -178,6 +176,7 @@ exit 0
%{_libdir}/colord-plugins %{_libdir}/colord-plugins
%ghost %attr(-,colord,colord) %{_localstatedir}/lib/colord/*.db %ghost %attr(-,colord,colord) %{_localstatedir}/lib/colord/*.db
%{_unitdir}/colord.service %{_unitdir}/colord.service
%{_sysusersdir}/colord.conf
# session helper # session helper
%{_libexecdir}/colord-session %{_libexecdir}/colord-session
@ -257,6 +256,10 @@ exit 0
%{_datadir}/installed-tests/colord/* %{_datadir}/installed-tests/colord/*
%changelog %changelog
* Sun Oct 01 2023 Daan De Meyer <daan.j.demeyer@gmail.com> - 1.4.6-7
- Provide a sysusers.d file to get user() and group() provides
(see https://fedoraproject.org/wiki/Changes/Adopting_sysusers.d_format).
* Fri Aug 18 2023 David King <amigadave@amigadave.com> - 1.4.6-6 * Fri Aug 18 2023 David King <amigadave@amigadave.com> - 1.4.6-6
- Rebuild for glib2 symbol export fix (#2232723) - Rebuild for glib2 symbol export fix (#2232723)

2
colord.sysusers Normal file
View File

@ -0,0 +1,2 @@
#Type Name ID GECOS Home directory Shell
u colord - "User for colord" /var/lib/colord /sbin/nologin