commit 9b131b032c3a3c8ad4d7d7cfc2d17f96cdc66e34 Author: Jan Rękorajski <bagg...@pld-linux.org> Date: Tue Jan 31 11:32:23 2012 +0000
- added tmpfiles config for systemd Cherry-picked 275af16791cf23090b719eb9874dd63de2ce00e9 Changed files: varnish.spec -> 1.69 Conflicts: varnish.spec varnish.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) --- diff --git a/varnish.spec b/varnish.spec index b6f3c48..e486655 100644 --- a/varnish.spec +++ b/varnish.spec @@ -21,6 +21,7 @@ Source4: %{name}.sysconfig Source5: %{name}ncsa.sysconfig Source6: %{name}.logrotate Source7: %{name}.conf +Source8: %{name}.tmpfiles Patch100: branch.diff Patch0: %{name}-build.patch URL: http://www.varnish-cache.org/ @@ -129,7 +130,8 @@ rm -rf $RPM_BUILD_ROOT # make dirs after make install to know which ones needs spec and which ones make install install -d $RPM_BUILD_ROOT{%{_sysconfdir},/etc/{logrotate.d,rc.d/init.d,sysconfig},/var/{run,lib}/varnish} \ - $RPM_BUILD_ROOT/var/log/{archive/,}varnish + $RPM_BUILD_ROOT/var/log/{archive/,}varnish \ + $RPM_BUILD_ROOT/usr/lib/tmpfiles.d install -p %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/varnish install -p %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/varnishncsa @@ -137,6 +139,7 @@ cp -a %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/varnish cp -a %{SOURCE5} $RPM_BUILD_ROOT/etc/sysconfig/varnishncsa cp -a %{SOURCE6} $RPM_BUILD_ROOT/etc/logrotate.d/varnish cp -a %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/default.vcl +cp -p %{SOURCE8} $RPM_BUILD_ROOT/usr/lib/tmpfiles.d/%{name}.conf %clean rm -rf $RPM_BUILD_ROOT @@ -184,6 +187,7 @@ fi %{_mandir}/man7/* %dir /var/lib/varnish %dir /var/run/varnish +/usr/lib/tmpfiles.d/%{name}.conf %dir %attr(751,root,root) /var/log/varnish %dir %attr(750,root,root) /var/log/archive/varnish ================================================================ ---- gitweb: http://git.pld-linux.org/gitweb.cgi/packages/varnish.git/commitdiff/14266db380dc5b6f773ec003d080ce7e3e1cdbfe _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit