Attachment 860813 Details for Bug 850188 – follow latest systemd guidelines

[patch] follow latest systemd guidelines

0003-follow-latest-systemd-guidelines.patch (text/plain), 1.89 KB, created by Ken Dreyer on 2014-02-08 04:03:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ken Dreyer

Created: 2014-02-08 04:03:00 UTC

Size: 1.89 KB

patch

obsolete

>From 1d809e33d7e94173e0fa08ebd9464be5b6a81cd1 Mon Sep 17 00:00:00 2001
>From: Ken Dreyer <ktdreyer@ktdreyer.com>
>Date: Fri, 7 Feb 2014 20:31:37 -0700
>Subject: [PATCH 3/3] follow latest systemd guidelines
>
>The original systemd support for lighttpd was following some very old
>guidelines. Update the package to follow the latest systemd guidelines
>concerning macros, requires, etc.
>---
> lighttpd.spec | 24 +++++++++---------------
> 1 file changed, 9 insertions(+), 15 deletions(-)
>
>diff --git a/lighttpd.spec b/lighttpd.spec
>index 45bb6ae..4ffdb77 100644
>--- a/lighttpd.spec
>+++ b/lighttpd.spec
>@@ -66,10 +66,10 @@ Requires: system-logos >= 7.92.1
> %endif
> Requires(pre): /usr/sbin/useradd
> %if %{with systemd}
>-Requires(post): systemd-units
>-Requires(post): systemd-sysv
>-Requires(preun): systemd-units
>-Requires(postun): systemd-units
>+Requires(post): systemd
>+Requires(preun): systemd
>+Requires(postun): systemd
>+BuildRequires: systemd
> %else
> Requires(post): /sbin/chkconfig
> Requires(preun): /sbin/service, /sbin/chkconfig
>@@ -227,30 +227,24 @@ rm -rf %{buildroot}
> 
> %post
> %if %{with systemd}
>-if [ $1 -eq 1 ] ; then 
>-    /bin/systemctl daemon-reload &>/dev/null || :
>-fi
>+%systemd_post lighttpd.service
> %else
> /sbin/chkconfig --add lighttpd
> %endif
> 
> %preun
>-if [ $1 -eq 0 ]; then
> %if %{with systemd}
>-    /bin/systemctl --no-reload disable lighttpd.service &>/dev/null || :
>-    /bin/systemctl stop lighttpd.service &>/dev/null || :
>+%systemd_preun lighttpd.service
> %else
>+if [ $1 -eq 0 ]; then
>     /sbin/service lighttpd stop &>/dev/null || :
>     /sbin/chkconfig --del lighttpd
>-%endif
> fi
>+%endif
> 
> %postun
> %if %{with systemd}
>-/bin/systemctl daemon-reload &>/dev/null || :
>-if [ $1 -ge 1 ]; then
>-    /bin/systemctl try-restart lighttpd.service &>/dev/null || :
>-fi
>+%systemd_postun_with_restart lighttpd.service
> %else
> if [ $1 -ge 1 ]; then
>     /sbin/service lighttpd condrestart &>/dev/null || :
>-- 
>1.8.5.3
>

Actions: View | Diff

Attachments on bug 850188: 860811 | 860812 | 860813