[packages/redis] pull tmpfiles config under systemd bcond

atler atler at pld-linux.org
Sat Sep 3 20:27:20 CEST 2022


commit da96ac2f794e6776d5c8396abcec5eddd7270da6
Author: Jan Palus <atler at pld-linux.org>
Date:   Sat Sep 3 20:19:33 2022 +0200

    pull tmpfiles config under systemd bcond

 redis.spec | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/redis.spec b/redis.spec
index 58d370b..7d23f54 100644
--- a/redis.spec
+++ b/redis.spec
@@ -141,8 +141,10 @@ mv $RPM_BUILD_ROOT{%{_bindir},%{_sbindir}}/%{name}-sentinel
 install -p %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
 cp -p %{SOURCE1} $RPM_BUILD_ROOT/etc/logrotate.d/%{name}
 cp -p %{name}.conf $RPM_BUILD_ROOT%{_sysconfdir}
+%if %{with systemd}
 cp -p %{SOURCE3} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/%{name}.conf
-%{?with_systemd:%{__sed} -e 's;@sbindir@;%{_sbindir};' -e 's;@localstatedir@;%{_localstatedir};' %{SOURCE4} > $RPM_BUILD_ROOT%{systemdunitdir}/%{name}.service}
+%{__sed} -e 's;@sbindir@;%{_sbindir};' -e 's;@localstatedir@;%{_localstatedir};' %{SOURCE4} > $RPM_BUILD_ROOT%{systemdunitdir}/%{name}.service
+%endif
 
 # man-pages
 for man in man/man1/*; do
@@ -205,8 +207,10 @@ fi
 %dir %attr(755,redis,root) %{_localstatedir}/log/%{name}
 %dir %attr(755,redis,root) %{_localstatedir}/log/archive/%{name}
 %dir %attr(755,redis,root) %{_localstatedir}/run/%{name}
+%if %{with systemd}
 %{systemdtmpfilesdir}/%{name}.conf
-%{?with_systemd:%{systemdunitdir}/%{name}.service}
+%{systemdunitdir}/%{name}.service
+%endif
 %{_mandir}/man1/redis-sentinel.1*
 %{_mandir}/man1/redis-server.1*
 %{_mandir}/man1/redis-check-aof.1*
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/redis.git/commitdiff/d3c8224c535a54a3951166cdb0e91bf7beb2bda4



More information about the pld-cvs-commit mailing list