@@ -12,30 +12,7 @@

 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

-%if 0%{?fedora} || 0%{?rhel} >= 7

-Requires:       pkgconfig

-BuildRequires:  systemd-units

-%endif

-

-%if 0%{?fedora} == 16 || 0%{?fedora} == 17

-Requires(post):     systemd-units

-Requires(preun):    systemd-units

-Requires(postun):   systemd-units

-%endif

-

-%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7

-Requires(post):     systemd-sysv

-Requires(post):     systemd

-Requires(preun):    systemd

-Requires(postun):   systemd

-%endif

-

-%if 0%{?rhel} == 5 || 0%{?rhel} == 6

-Requires(post):     /sbin/chkconfig

-Requires(preun):    /sbin/chkconfig

-Requires(preun):    /sbin/service

-Requires(postun):   /sbin/service

-%endif

+BuildRequires: make automake gcc gcc-c++ autoconf openssl-devel

 %description

 New djbdns: is a usable fork of djbdns. `djbdns' is a Domain Name System

@@ -61,22 +38,13 @@

 rm -rf $RPM_BUILD_ROOT

 make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"

-%if 0%{?rhel} == 5 || 0%{?rhel} == 6

 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/logrotate.d/

 mv ndjbdns.logrotate $RPM_BUILD_ROOT/%{_sysconfdir}/logrotate.d/ndjbdns

-%endif

 %clean

 rm -rf $RPM_BUILD_ROOT

-%if 0%{?fedora} == 16 || 0%{?fedora} == 17

-

-%post

-if [ $1 -eq 1 ]; then

-    # Initial installation

-    /bin/systemctl daemon-reload >/dev/null 2>&1 || :

-fi

 # remove old files from earlier installation, because these files

 # are moved to `../sbin/' and `../man8/' directories.

@@ -93,64 +61,6 @@

 [ -f %{_mandir}/man1/tinydns.1.gz ]  && rm %{_mandir}/man1/tinydns.1.gz

 [ -f %{_mandir}/man1/walldns.1.gz ]  && rm %{_mandir}/man1/walldns.1.gz

-%preun

-if [ $1 -eq 0 ]; then

-    # Package removal, not upgrade

-    /sbin/systemctl --no-reload disable axfrdns.service > /dev/null 2>&1 || :

-    /sbin/systemctl stop axfrdns.service > /dev/null 2>&1 || :

-

-    /sbin/systemctl --no-reload disable dnscache.service > /dev/null 2>&1 || :

-    /sbin/systemctl stop dnscache.service > /dev/null 2>&1 || :

-

-    /sbin/systemctl --no-reload disable rbldns.service > /dev/null 2>&1 || :

-    /sbin/systemctl stop rbldns.service > /dev/null 2>&1 || :

-

-    /sbin/systemctl --no-reload disable tinydns.service > /dev/null 2>&1 || :

-    /sbin/systemctl stop tinydns.service > /dev/null 2>&1 || :

-

-    /sbin/systemctl --no-reload disable walldns.service > /dev/null 2>&1 || :

-    /sbin/systemctl stop walldns.service > /dev/null 2>&1 || :

-fi

-

-%postun

-/bin/systemctl daemon-reload > /dev/null 2>&1 || :

-if [ $1 -ge 1 ]; then

-    # Package upgrade, not uninstall

-    /bin/systemctl try-restart axfrdns.service > /dev/null 2>&1 || :

-    /bin/systemctl try-restart dnscache.service > /dev/null 2>&1 || :

-    /bin/systemctl try-restart rbldns.service > /dev/null 2>&1 || :

-    /bin/systemctl try-restart tinydns.service > /dev/null 2>&1 || :

-    /bin/systemctl try-restart walldns.service > /dev/null 2>&1 || :

-fi

-

-%endif

-

-%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7

-

-%post

-%systemd_post axfrdns.service

-%systemd_post dnscache.service

-%systemd_post rbldns.service

-%systemd_post tinydns.service

-%systemd_post walldns.service

-

-%preun

-%systemd_preun axfrdns.service

-%systemd_preun dnscache.service

-%systemd_preun rbldns.service

-%systemd_preun tinydns.service

-%systemd_preun walldns.service

-

-%postun

-%systemd_postun_with_restart axfrdns.service

-%systemd_postun_with_restart dnscache.service

-%systemd_postun_with_restart rbldns.service

-%systemd_postun_with_restart tinydns.service

-%systemd_postun_with_restart walldns.service

-

-%endif

-

-%if 0%{?rhel} == 6 || 0%{?rhel} == 5

 %post

 /sbin/chkconfig --add axfrdns

​