From c89ed84caa4747476f3b2114bc9d1d2a67f1b23ab3694e47d249eb76fe958941 Mon Sep 17 00:00:00 2001 From: Paolo Stivanin Date: Mon, 5 Feb 2024 08:15:39 +0000 Subject: [PATCH 1/4] - Adapt to RPM 4.19 on Tumbleweed. OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/gerbera?expand=0&rev=55 --- gerbera.changes | 5 +++++ gerbera.spec | 18 +++++++++--------- gerbera.sysusers.in | 4 ++-- 3 files changed, 16 insertions(+), 11 deletions(-) diff --git a/gerbera.changes b/gerbera.changes index 074908a..c579c2c 100644 --- a/gerbera.changes +++ b/gerbera.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Feb 5 07:37:46 UTC 2024 - Paolo Stivanin + +- Adapt to RPM 4.19 on Tumbleweed. + ------------------------------------------------------------------- Mon Jan 8 07:14:18 UTC 2024 - Paolo Stivanin diff --git a/gerbera.spec b/gerbera.spec index 17a5de1..c3e1ec5 100644 --- a/gerbera.spec +++ b/gerbera.spec @@ -37,6 +37,8 @@ BuildRequires: fdupes BuildRequires: file-devel BuildRequires: hicolor-icon-theme BuildRequires: pkgconfig +BuildRequires: sysuser-shadow +BuildRequires: sysuser-tools BuildRequires: pkgconfig(duktape) BuildRequires: pkgconfig(exiv2) BuildRequires: pkgconfig(gmock) @@ -61,7 +63,12 @@ BuildRequires: pkgconfig(uuid) BuildRequires: pkgconfig(zlib) Requires: logrotate %{?systemd_requires} +%sysusers_requires BuildRequires: gcc%{?force_gcc_version}-c++ >= 12 +%if 0%{?suse_version} +Provides: group(gerbera) +Provides: user(gerbera) +%endif %description Gerbera is a UPnP media server which allows streaming digital @@ -115,25 +122,18 @@ install -d %{buildroot}%{_sbindir} ln -s service %{buildroot}%{_sbindir}/rc%{name} install -p -D -m0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/gerbera/config.xml + +%sysusers_generate_pre %{SOURCE2} %{name} %{name}.conf install -p -D -m0644 %{SOURCE2} %{buildroot}%{_sysusersdir}/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 %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 diff --git a/gerbera.sysusers.in b/gerbera.sysusers.in index c6f319b..47e49f0 100644 --- a/gerbera.sysusers.in +++ b/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 - - - From 0c95a20b71b42975b20345054c52e31c8cb2ade65c8bf77eef495a4a3f382312 Mon Sep 17 00:00:00 2001 From: Paolo Stivanin Date: Mon, 5 Feb 2024 12:40:20 +0000 Subject: [PATCH 2/4] Accepting request 1144219 from home:dimstar:Factory - ACtually run the generated sysusers script as part of pre (do not manually provide the user() symbol, taken care of bu rpm/sysusers. OBS-URL: https://build.opensuse.org/request/show/1144219 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/gerbera?expand=0&rev=56 --- gerbera.changes | 7 +++++++ gerbera.spec | 7 +------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/gerbera.changes b/gerbera.changes index c579c2c..3a824f8 100644 --- a/gerbera.changes +++ b/gerbera.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Feb 5 11:53:56 UTC 2024 - Dominique Leuenberger + +- 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 diff --git a/gerbera.spec b/gerbera.spec index c3e1ec5..8af3866 100644 --- a/gerbera.spec +++ b/gerbera.spec @@ -37,7 +37,6 @@ BuildRequires: fdupes BuildRequires: file-devel BuildRequires: hicolor-icon-theme BuildRequires: pkgconfig -BuildRequires: sysuser-shadow BuildRequires: sysuser-tools BuildRequires: pkgconfig(duktape) BuildRequires: pkgconfig(exiv2) @@ -65,10 +64,6 @@ Requires: logrotate %{?systemd_requires} %sysusers_requires BuildRequires: gcc%{?force_gcc_version}-c++ >= 12 -%if 0%{?suse_version} -Provides: group(gerbera) -Provides: user(gerbera) -%endif %description Gerbera is a UPnP media server which allows streaming digital @@ -129,7 +124,7 @@ install -p -D -m0644 %{SOURCE2} %{buildroot}%{_sysusersdir}/gerbera.conf %check %ctest -%pre +%pre -f %{name}.pre %service_add_pre %{name}.service %post From e1ae58c9895e43f8df273d833965b5f2d9f0e089befd11a9191e1bfa541edc76 Mon Sep 17 00:00:00 2001 From: Paolo Stivanin Date: Mon, 5 Feb 2024 12:42:21 +0000 Subject: [PATCH 3/4] OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/gerbera?expand=0&rev=57 --- gerbera.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/gerbera.spec b/gerbera.spec index 8af3866..e04bdba 100644 --- a/gerbera.spec +++ b/gerbera.spec @@ -117,8 +117,6 @@ install -d %{buildroot}%{_sbindir} ln -s service %{buildroot}%{_sbindir}/rc%{name} install -p -D -m0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/gerbera/config.xml - -%sysusers_generate_pre %{SOURCE2} %{name} %{name}.conf install -p -D -m0644 %{SOURCE2} %{buildroot}%{_sysusersdir}/gerbera.conf %check From 03dfb5f871e8c41cb81c1930ee333f3f7998a895698b46ccac7e8e309881da37 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 5 Feb 2024 14:00:27 +0000 Subject: [PATCH 4/4] Accepting request 1144265 from home:dimstar:Factory - 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 OBS-URL: https://build.opensuse.org/request/show/1144265 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/gerbera?expand=0&rev=58 --- gerbera.changes | 7 ++++++- gerbera.spec | 2 ++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/gerbera.changes b/gerbera.changes index 3a824f8..d3d37b3 100644 --- a/gerbera.changes +++ b/gerbera.changes @@ -1,7 +1,12 @@ +------------------------------------------------------------------- +Mon Feb 5 13:23:17 UTC 2024 - Dominique Leuenberger + +- Generate the pre script usingn sysusers_generate. + ------------------------------------------------------------------- Mon Feb 5 11:53:56 UTC 2024 - Dominique Leuenberger -- ACtually run the generated sysusers script as part of pre (do not +- Actually run the generated sysusers script as part of pre (do not manually provide the user() symbol, taken care of bu rpm/sysusers. diff --git a/gerbera.spec b/gerbera.spec index e04bdba..191ad25 100644 --- a/gerbera.spec +++ b/gerbera.spec @@ -119,6 +119,8 @@ 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