Accepting request 1144293 from home:avicenzi:branches:server:http

RPM 4.19 updates

OBS-URL: https://build.opensuse.org/request/show/1144293
OBS-URL: https://build.opensuse.org/package/show/server:http/caddy?expand=0&rev=41
This commit is contained in:
Alexandre Vicenzi 2024-02-05 14:30:55 +00:00 committed by Git OBS Bridge
parent af464b31f6
commit 004bcb38f4
3 changed files with 15 additions and 4 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Feb 5 13:40:52 UTC 2024 - Alexandre Vicenzi <alexandre.vicenzi@suse.com>
- Provide user and group (due to RPM 4.19)
- Update caddy.sysusers to also create a group
-------------------------------------------------------------------
Fri Dec 08 02:07:42 UTC 2023 - Jeff Kowalczyk <jkowalczyk@suse.com>

View File

@ -1,7 +1,7 @@
#
# spec file for package caddy
#
# Copyright (c) 2023 SUSE LLC
# Copyright (c) 2024 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -17,6 +17,8 @@
%define project github.com/caddyserver/caddy
%define gname caddy
%define uname caddy
# SLE-12 _sharedstatedir was /usr/com, _localstatedir is /var as expected
# SLE-15+ _sharedstatedir is /var/lib, _localstatedir is /var
@ -45,6 +47,8 @@ BuildRequires: golang-packaging
BuildRequires: systemd-rpm-macros
BuildRequires: sysuser-tools
BuildRequires: golang(API) >= 1.20
Provides: group(%{gname})
Provides: user(%{uname})
%{?systemd_requires}
%{sysusers_requires}
%{go_provides}
@ -118,7 +122,7 @@ install -D -p -m 0644 %{SOURCE6} %{buildroot}%{_datadir}/zsh/site-functions/_%{n
%{_sysusersdir}/%{name}.conf
%dir %{_sysconfdir}/%{name}
%config(noreplace) %{_sysconfdir}/%{name}/Caddyfile
%attr(0750,%{name},%{name}) %dir %{_sharedstatedir}/%{name}
%dir %attr(0750, %{uname}, %{gname}) %{_sharedstatedir}/%{name}
# filesystem owns all the parent directories here
%{_datadir}/bash-completion/completions/%{name}
# own parent directories in case zsh is not installed

View File

@ -1,2 +1,3 @@
# Type Name ID GECOS [HOME]
u caddy - "Caddy web server" /var/lib/caddy
#Type Name ID GECOS Home directory Shell
u caddy - "Caddy web server" /var/lib/caddy -
g caddy - - - -