Accepting request 1144284 from multimedia:apps

- Generate the pre script usingn sysusers_generate.

- Actually run the generated sysusers script as part of pre (do not

Sorry - I missed that on the previous fixup. Now we should be good for sysusers (forwarded request 1144265 from dimstar)

OBS-URL: https://build.opensuse.org/request/show/1144284
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gerbera?expand=0&rev=14

gerbera.changes

@@ -1,3 +1,20 @@
+-------------------------------------------------------------------
+Mon Feb  5 13:23:17 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Generate the pre script usingn sysusers_generate.
+
+-------------------------------------------------------------------
+Mon Feb  5 11:53:56 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Actually run the generated sysusers script as part of pre (do not
+  manually provide the user() symbol, taken care of bu
+  rpm/sysusers.
+
+-------------------------------------------------------------------
+Mon Feb  5 07:37:46 UTC 2024 - Paolo Stivanin <info@paolostivanin.com>
+
+- Adapt to RPM 4.19 on Tumbleweed.
+
 -------------------------------------------------------------------
 Mon Jan  8 07:14:18 UTC 2024 - Paolo Stivanin <info@paolostivanin.com>
 

gerbera.spec

@@ -37,6 +37,7 @@ BuildRequires:  fdupes
 BuildRequires:  file-devel
 BuildRequires:  hicolor-icon-theme
 BuildRequires:  pkgconfig
+BuildRequires:  sysuser-tools
 BuildRequires:  pkgconfig(duktape)
 BuildRequires:  pkgconfig(exiv2)
 BuildRequires:  pkgconfig(gmock)
@@ -61,6 +62,7 @@ BuildRequires:  pkgconfig(uuid)
 BuildRequires:  pkgconfig(zlib)
 Requires:       logrotate
 %{?systemd_requires}
+%sysusers_requires
 BuildRequires:  gcc%{?force_gcc_version}-c++ >= 12
 
 %description
@@ -117,23 +119,16 @@ ln -s service  %{buildroot}%{_sbindir}/rc%{name}
 install -p -D -m0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/gerbera/config.xml
 install -p -D -m0644 %{SOURCE2} %{buildroot}%{_sysusersdir}/gerbera.conf
 
+%sysusers_generate_pre %{buildroot}%{_sysusersdir}/gerbera.conf gerbera gerbera.conf
+
 %check
 %ctest
 
-%pre
-getent group gerbera >/dev/null || groupadd -r gerbera
-getent passwd gerbera >/dev/null || \
-useradd -r -g gerbera -d %{_sysconfdir}/gerbera -s /sbin/nologin \
-    -c "To run Gerbera" gerbera
+%pre -f %{name}.pre
 %service_add_pre %{name}.service
 
 %post
 %service_add_post %{name}.service
-%if 0%{?suse_version} > 1590
-%sysusers_create_package %{name} %{SOURCE2}
-%else
-%sysusers_create %{_sysusersdir}/%{name}.conf
-%endif
 
 %preun
 %service_del_preun %{name}.service

gerbera.sysusers.in

@@ -1,2 +1,2 @@
-u gerbera - "Gerbera daemon user" /var/lib/gerbera
-m gerbera video
+u gerbera -     "Gerbera daemon user" /var/lib/gerbera  -
+m gerbera video -                     -                 -