Accepting request 787910 from home:kukuk:branches:server:database

- Use the tmpfiles macros instead of calling systemd-tempfiles
  direct and build wrong macro paths.

OBS-URL: https://build.opensuse.org/request/show/787910
OBS-URL: https://build.opensuse.org/package/show/server:database/redis?expand=0&rev=136
This commit is contained in:
Martin Pluskal 2020-03-25 07:11:31 +00:00 committed by Git OBS Bridge
parent bb7cea626c
commit b11fef3138
2 changed files with 9 additions and 3 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Mar 24 19:04:42 UTC 2020 - Thorsten Kukuk <kukuk@suse.com>
- Use the tmpfiles macros instead of calling systemd-tempfiles
direct and build wrong macro paths.
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Mar 18 02:18:24 UTC 2020 - Илья Индиго <ilya@ilya.pp.ua> Wed Mar 18 02:18:24 UTC 2020 - Илья Индиго <ilya@ilya.pp.ua>
- Refresh spec-file with spec-cleaner and manual optimizations - Refresh spec-file with spec-cleaner and manual optimizations

View File

@ -99,7 +99,7 @@ install -Dm 0644 %{SOURCE6} %{buildroot}%{_sysconfdir}/sysctl.d/00-%{name}.conf
install -Dm 0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/logrotate.d/%{name} install -Dm 0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
install -Dm 0644 %{SOURCE2} %{buildroot}%{_unitdir}/%{name}.target install -Dm 0644 %{SOURCE2} %{buildroot}%{_unitdir}/%{name}.target
install -Dm 0644 %{SOURCE3} %{buildroot}%{_unitdir}/%{name}@.service install -Dm 0644 %{SOURCE3} %{buildroot}%{_unitdir}/%{name}@.service
install -Dm 0644 %{SOURCE4} %{buildroot}%{_libexecdir}/tmpfiles.d/%{name}.conf install -Dm 0644 %{SOURCE4} %{buildroot}%{_tmpfilesdir}/%{name}.conf
install -Dm 0644 %{SOURCE7} %{buildroot}%{_unitdir}/%{name}-sentinel@.service install -Dm 0644 %{SOURCE7} %{buildroot}%{_unitdir}/%{name}-sentinel@.service
install -Dm 0644 %{SOURCE8} %{buildroot}%{_unitdir}/%{name}-sentinel.target install -Dm 0644 %{SOURCE8} %{buildroot}%{_unitdir}/%{name}-sentinel.target
@ -124,7 +124,7 @@ EOF
%service_add_pre redis.target redis@.service redis-sentinel.target redis-sentinel@.service %service_add_pre redis.target redis@.service redis-sentinel.target redis-sentinel@.service
%post %post
systemd-tmpfiles --create %{_libexecdir}/tmpfiles.d/%{name}.conf || true %tmpfiles_create %{_tmpfilesdir}/%{name}.conf
%service_add_post redis.target redis@.service redis-sentinel.target redis-sentinel@.service %service_add_post redis.target redis@.service redis-sentinel.target redis-sentinel@.service
echo "See %{_docdir}/%{name}/README.SUSE to continue" echo "See %{_docdir}/%{name}/README.SUSE to continue"
@ -142,7 +142,7 @@ echo "See %{_docdir}/%{name}/README.SUSE to continue"
%{_bindir}/%{name}-* %{_bindir}/%{name}-*
%{_sbindir}/%{name}-* %{_sbindir}/%{name}-*
%{_sbindir}/rc%{name} %{_sbindir}/rc%{name}
%{_libexecdir}/tmpfiles.d/%{name}.conf %{_tmpfilesdir}/%{name}.conf
%{_sysusersdir}/redis-user.conf %{_sysusersdir}/redis-user.conf
%{_unitdir}/%{name}@.service %{_unitdir}/%{name}@.service
%{_unitdir}/%{name}.target %{_unitdir}/%{name}.target