fix dnsdist spec file

diff --git a/builder-support/dockerfiles/Dockerfile.dnsdist b/builder-support/dockerfiles/Dockerfile.dnsdist
index ab7a3352b7a1552c7d7d74b3861c0cf2f4ac23c9..fb886a4753ff64994426bc4b0964811005fdb096 100644 (file)
--- a/builder-support/dockerfiles/Dockerfile.dnsdist
+++ b/builder-support/dockerfiles/Dockerfile.dnsdist
@@ -1,9 +1,7 @@
 FROM alpine:3.6 as dnsdist
 
 RUN apk add --no-cache gcc g++ make tar autoconf automake protobuf-dev lua-dev \
-                       libtool file boost-dev ragel py-virtualenv
-RUN apk add --no-cache \
-                       libedit-dev
+                       libtool file boost-dev ragel py-virtualenv git libedit-dev
 
 ADD builder/helpers/set-configure-ac-version.sh /dnsdist/builder/helpers/
 @EXEC sdist_dirs=(build-aux m4 pdns ext)

diff --git a/builder-support/specs/dnsdist.spec b/builder-support/specs/dnsdist.spec
index bb0d60f8e5829a77bd3ea2d47e40767bbd04a2e2..9cc878bbe74f87e08385ee6ae900474a551c575a 100644 (file)
--- a/builder-support/specs/dnsdist.spec
+++ b/builder-support/specs/dnsdist.spec
@@ -15,12 +15,14 @@ BuildRequires: lua-devel
 BuildRequires: protobuf-compiler
 BuildRequires: protobuf-devel
 BuildRequires: re2-devel
-%elif 0%{?suse_version}
+%endif
+%if 0%{?suse_version}
 BuildRequires: boost-devel
 BuildRequires: lua-devel
 BuildRequires: systemd-units
 BuildRequires: systemd-devel
-%else
+%endif
+%if 0%{?rhel} >= 7
 BuildRequires: boost-devel
 BuildRequires: libsodium-devel
 BuildRequires: luajit-devel
@@ -34,10 +36,12 @@ BuildRequires: systemd-devel
 
 %if 0%{?el6}
 Requires(pre): shadow-utils
-%elif 0%{suse_version}
+%endif
+%if 0%{?suse_version}
 Requires(pre): shadow
 %systemd_requires
-%else
+%endif
+%if 0%{?rhel} >= 7
 Requires(pre): shadow-utils
 %systemd_requires
 %endif
@@ -61,14 +65,16 @@ sed -i '/^ExecStart/ s/dnsdist/dnsdist -u dnsdist -g dnsdist/' dnsdist.service.i
   --with-net-snmp \
   --with-protobuf \
   --with-boost=/usr/include/boost148 LIBRARY_PATH=/usr/lib64/boost148
-%elif 0%{suse_version}
+%endif
+%if 0%{?suse_version}
   --disable-dnscrypt \
   --disable-libsodium \
   --disable-re2 \
   --enable-systemd --with-systemd=/lib/systemd/system \
   --without-protobuf \
   --without-net-snmp
-%else
+%endif
+%if 0%{?rhel} >= 7
   --with-protobuf \
   --with-luajit \
   --enable-libsodium \
@@ -109,9 +115,11 @@ exit 0
 %post
 %if 0%{?el6}
 /sbin/chkconfig --add %{name}
-%elif 0%{?suse_version}
+%endif
+%if 0%{?suse_version}
 %service_add_post %{name}.service
-%else
+%endif
+%if 0%{?rhel} >= 7
 %systemd_post %{name}.service
 %endif
 
@@ -122,9 +130,11 @@ if [ "\$1" -eq "0" ]; then
   /sbin/service %{name} stop > /dev/null 2>&1 || :
   /sbin/chkconfig --del %{name}
 fi
-%elif 0%{?suse_version}
+%endif
+%if 0%{?suse_version}
 %service_del_preun %{name}.service
-%else
+%endif
+%if 0%{?rhel} >= 7
 %systemd_preun %{name}.service
 %endif
 
@@ -133,9 +143,11 @@ fi
 if [ "\$1" -ge "1" ] ; then
   /sbin/service %{name} condrestart >/dev/null 2>&1 || :
 fi
-%elif 0%{?suse_version}
+%endif
+%if 0%{?suse_version}
 %service_del_postun %{name}.service
-%else
+%endif
+%if 0%{?rhel} >= 7
 %systemd_postun_with_restart %{name}.service
 %endif