rpms: Disable tcp_wrapper for rhel8 in bacula.spec.in

diff --git a/bacula/platforms/rpms/redhat/bacula.spec.in b/bacula/platforms/rpms/redhat/bacula.spec.in
index 62dacfe0c905ad322c58de3422edc505399a6b29..2c266ff6c43ee263eeb525c1aba715128b24ef92 100644 (file)
--- a/bacula/platforms/rpms/redhat/bacula.spec.in
+++ b/bacula/platforms/rpms/redhat/bacula.spec.in
@@ -320,9 +320,16 @@ Distribution: %_dist
 BuildRequires: openldap-devel
 
 # should we enable tcp wrappers support
-%define tcpwrappers 1
 %{?build_tcpwrappers:%define tcpwrappers 1}
 
+# should we enable tcp wrappers support
+%if %{rhel8}
+%define tcpwrappers 0
+%else
+%define tcpwrappers 1
+%endif
+
+
 # do we need to patch for old postgresql version?
 %define old_pgsql 0
 %{?build_old_pgsql:%define old_pgsql 1}
@@ -361,8 +368,10 @@ BuildRequires: libstdc++-static-devel
 BuildRequires: glibc-static-devel
 %endif
 
-%if %{mysql} && ! %{suse}
+%if %{mysql} && ! %{suse} && ! %{rhel7}
 BuildRequires: mysql-devel
+%else
+BuildRequires: mariadb-devel
 %endif
 
 %if %{postgresql}
@@ -643,7 +652,9 @@ export BACULA="Bacula"
 %if %{usesystemd}
         --with-systemd=%{systemd_dir} \
 %endif
+%if %{tcpwrappers}
         --with-tcp-wrappers  \
+%endif
         --with-dir-user=%{director_daemon_user} \
         --with-dir-group=%{daemon_group} \
         --with-sd-user=%{storage_daemon_user} \