From 13bd5ed972ca4392887529f0a3a91546a076610c587e88ef36aa2d4a223da2dd Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Wed, 25 Mar 2020 07:11:31 +0000 Subject: [PATCH] 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 --- redis.changes | 6 ++++++ redis.spec | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/redis.changes b/redis.changes index b1829e5..abacf63 100644 --- a/redis.changes +++ b/redis.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Mar 24 19:04:42 UTC 2020 - Thorsten Kukuk + +- Use the tmpfiles macros instead of calling systemd-tempfiles + direct and build wrong macro paths. + ------------------------------------------------------------------- Wed Mar 18 02:18:24 UTC 2020 - Илья Индиго - Refresh spec-file with spec-cleaner and manual optimizations diff --git a/redis.spec b/redis.spec index 3fa86de..f147d67 100644 --- a/redis.spec +++ b/redis.spec @@ -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 %{SOURCE2} %{buildroot}%{_unitdir}/%{name}.target 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 %{SOURCE8} %{buildroot}%{_unitdir}/%{name}-sentinel.target @@ -124,7 +124,7 @@ EOF %service_add_pre redis.target redis@.service redis-sentinel.target redis-sentinel@.service %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 echo "See %{_docdir}/%{name}/README.SUSE to continue" @@ -142,7 +142,7 @@ echo "See %{_docdir}/%{name}/README.SUSE to continue" %{_bindir}/%{name}-* %{_sbindir}/%{name}-* %{_sbindir}/rc%{name} -%{_libexecdir}/tmpfiles.d/%{name}.conf +%{_tmpfilesdir}/%{name}.conf %{_sysusersdir}/redis-user.conf %{_unitdir}/%{name}@.service %{_unitdir}/%{name}.target