From: Pieter Lexis <pieter.lexis@powerdns.com>
Date: Mon, 21 May 2018 20:01:57 +0000 (+0200)
Subject: dnsdist: fix RPM scriptlets
X-Git-Tag: dnsdist-1.3.1~82^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3e27601f900aa91c4f17ae4d24b48564fab157e4;p=pdns

dnsdist: fix RPM scriptlets

We used the non-existing `%elif` rpm macro ¯\_(ツ)_/¯.
---

diff --git a/build-scripts/build-dnsdist-rpm b/build-scripts/build-dnsdist-rpm
index 118bf2e2b..4a538ee8b 100755
--- a/build-scripts/build-dnsdist-rpm
+++ b/build-scripts/build-dnsdist-rpm
@@ -172,38 +172,44 @@ exit 0
 
 
 %post
-%if 0%{?el6}
+%if 0%{?rhel} < 7
 if [ -x /sbin/initctl ]; then
    /sbin/initctl reload-configuration
 fi
-%elif 0%{?suse_version}
+%else
+%if 0%{?suse_version}
 %service_add_post %{name}.service
 %else
 %systemd_post %{name}.service
 %endif
+%endif
 
 %preun
-%if 0%{?el6}
+%if 0%{?rhel} < 7
 if [ \$1 -eq 0 ] ; then
     # This is package removal, not upgrade
     /sbin/stop %{name} >/dev/null 2>&1 || :
 fi
-%elif 0%{?suse_version}
+%else
+%if 0%{?suse_version}
 %service_del_preun %{name}.service
 %else
 %systemd_preun %{name}.service
 %endif
+%endif
 
 %postun
-%if 0%{?el6}
+%if 0%{?rhel} < 7
 if [ -x /sbin/initctl ] && /sbin/initctl status %{name} 2>/dev/null | grep -q 'running' ; then
   /sbin/initctl stop %{name} > /dev/null 2>&1 || :
 fi
-%elif 0%{?suse_version}
+%else
+%if 0%{?suse_version}
 %service_del_postun %{name}.service
 %else
 %systemd_postun_with_restart %{name}.service
 %endif
+%endif
 
 %files
 %{!?_licensedir:%global license %%doc}