[packages/redis] Revert "pull tmpfiles config under systemd bcond"

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


commit 07ec6b17474c8b4bb471b985c376ce696fa8ea73
Author: Jan Palus <atler at pld-linux.org>
Date:   Sat Sep 3 20:34:10 2022 +0200

    Revert "pull tmpfiles config under systemd bcond"
    
    This reverts commit da96ac2f794e6776d5c8396abcec5eddd7270da6.

 redis.spec | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)
---
diff --git a/redis.spec b/redis.spec
index 3688e48..c1eb7c7 100644
--- a/redis.spec
+++ b/redis.spec
@@ -141,10 +141,8 @@ 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
-%{__sed} -e 's;@sbindir@;%{_sbindir};' -e 's;@localstatedir@;%{_localstatedir};' %{SOURCE4} > $RPM_BUILD_ROOT%{systemdunitdir}/%{name}.service
-%endif
+%{?with_systemd:%{__sed} -e 's;@sbindir@;%{_sbindir};' -e 's;@localstatedir@;%{_localstatedir};' %{SOURCE4} > $RPM_BUILD_ROOT%{systemdunitdir}/%{name}.service}
 
 # man-pages
 for man in man/man1/*; do
@@ -207,10 +205,8 @@ fi
 %dir %attr(750,redis,redis) %{_localstatedir}/log/%{name}
 %dir %attr(750,redis,redis) %{_localstatedir}/log/archive/%{name}
 %dir %attr(750,redis,redis) %{_localstatedir}/run/%{name}
-%if %{with systemd}
 %{systemdtmpfilesdir}/%{name}.conf
-%{systemdunitdir}/%{name}.service
-%endif
+%{?with_systemd:%{systemdunitdir}/%{name}.service}
 %{_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/8a824dbf3fd65342988f9d84e357787af251fa83



More information about the pld-cvs-commit mailing list