]> git.ipfire.org Git - thirdparty/bacula.git/commitdiff
rpms: Disable tcp_wrapper for rhel8 in bacula.spec.in
authorDavide Franco <packager@dflc.ch>
Sat, 5 Jun 2021 07:43:51 +0000 (09:43 +0200)
committerEric Bollengier <eric@baculasystems.com>
Mon, 7 Jun 2021 13:23:40 +0000 (15:23 +0200)
bacula/platforms/rpms/redhat/bacula.spec.in

index 38bee030076f4fe81cf128a6588174fd4542cef3..b469b7a0c75c22954d34845244ab9afad682f246 100644 (file)
@@ -316,9 +316,15 @@ exit 1
 
 Distribution: %_dist
 
+%{?build_tcpwrappers:%define tcpwrappers 1}
+
 # should we enable tcp wrappers support
+%if %{rhel8}
+%define tcpwrappers 0
+%else
 %define tcpwrappers 1
-%{?build_tcpwrappers:%define tcpwrappers 1}
+%endif
+
 
 # do we need to patch for old postgresql version?
 %define old_pgsql 0
@@ -358,8 +364,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}
@@ -639,7 +647,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} \