changeset 469:0370916c7626

allow building on el8
author Carl Byington <carl@five-ten-sg.com>
date Wed, 16 Dec 2020 11:23:27 -0800
parents d87a0b83e3f0
children cef0da2a3b32
files dnsbl.spec.in
diffstat 1 files changed, 7 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/dnsbl.spec.in	Wed Dec 16 10:28:21 2020 -0800
+++ b/dnsbl.spec.in	Wed Dec 16 11:23:27 2020 -0800
@@ -23,7 +23,7 @@
 BuildRequires:      sendmail-devel >= 8.12.1
 BuildRequires:      spamassassin
 BuildRequires:      glibc-devel, glibc-static
-%if "%{?dist}" == ".el7"
+%if "%{?dist}" > ".el6"
 Requires(pre):  systemd-sysv, shadow-utils
 Requires(post): systemd-units
 Requires(preun):  systemd-units
@@ -69,7 +69,7 @@
 mkdir -p %{buildroot}%{_sysconfdir}/%{name}/.spamassassin
 install -m 644 -D %{buildroot}%{_sysconfdir}/%{name}/dnsblnogrey \
      %{buildroot}/var/dcc/userdirs/dnsblnogrey/whiteclnt
-%if "%{?dist}" == ".el7"
+%if "%{?dist}" > ".el6"
 install -m 644 -D %{buildroot}%{_sysconfdir}/%{name}/%{name}.service \
     %{buildroot}%{_unitdir}/%{name}.service
 install -m 755 -d %{buildroot}%{_prefix}/lib/tmpfiles.d
@@ -93,7 +93,7 @@
 %post
 if [ $1 = 1 ]; then
     # initial install
-%if "%{?dist}" == ".el7"
+%if "%{?dist}" > ".el6"
     /bin/systemctl daemon-reload &>/dev/null || :
 %else
     /sbin/chkconfig --add %{name}
@@ -106,7 +106,7 @@
 %preun
 if [ $1 = 0 ]; then
     # package removal, not upgrade
-%if "%{?dist}" == ".el7"
+%if "%{?dist}" > ".el6"
     /bin/systemctl --no-reload disable %{name}.service &>/dev/null || :
     /bin/systemctl stop %{name}.service &>/dev/null || :
 %else
@@ -119,7 +119,7 @@
 %postun
 if [ $1 -ge 1 ]; then
     # package upgrade, not uninstall
-%if "%{?dist}" == ".el7"
+%if "%{?dist}" > ".el6"
     /bin/systemctl try-restart %{name}.service &>/dev/null || :
 %else
     /sbin/service %{name} restart || :
@@ -141,7 +141,7 @@
 %config(noreplace) %attr(0750,%{name},root) %{_sysconfdir}/%{name}
 %dir %attr(0750,dcc,dcc) /var/dcc/userdirs/dnsblnogrey
 %config(noreplace) %attr(0644,dcc,dcc) /var/dcc/userdirs/dnsblnogrey/whiteclnt
-%if "%{?dist}" == ".el7"
+%if "%{?dist}" > ".el6"
 %{_prefix}/lib/tmpfiles.d/%{name}.conf
 %{_unitdir}/%{name}.service
 %else
@@ -158,6 +158,7 @@
   via RPZ.
 - snprintf changes for GCC stricter checking on Fedora.
 - case insensitive comparisons for SPF tokens in TXT records.
+- allow building on el8
 
 * Thu Apr 25 2019 Carl Byington <carl@five-ten-sg.com> - 6.76-1
 - SA needs original rfc5321 envelope from to do proper spf