Up to 9.18.8.

[packages/bind.git] / bind.spec

diff --git a/bind.spec b/bind.spec
index 616ea8b791e4620ccb8722050a87d3595c49c087..9edc05cab3f342b9809110bf3a0a29de933400e7 100644 (file)
--- a/bind.spec
+++ b/bind.spec
@@ -7,6 +7,7 @@
 %bcond_without kerberos5       # GSS-API support
 %bcond_without ssl             # OpenSSL support
 %bcond_without lmdb            # LMDB storage support for addzone zones
+%bcond_without doh             # DNS over HTTPS support
 %bcond_with    static_libs     # static libraries
 %bcond_with    system_tests    # system tests (require root to configure localhost IPs)
 %bcond_with    tests           # unit tests
@@ -23,7 +24,7 @@
 %bcond_without epoll           # disable epoll support
 %endif
 
-%define                ver     9.18.1
+%define                ver     9.18.8
 %if 0
 %define                pverdot .P0
 %define                pverdir -P0
@@ -48,7 +49,7 @@ Epoch:                7
 License:       MPL 2.0
 Group:         Networking/Daemons
 Source0:       ftp://ftp.isc.org/isc/bind9/%{ver}%{pverdir}/%{name}-%{ver}%{pverdir}.tar.xz
-# Source0-md5: d7072b2d774077f37bff51580b3a577b
+# Source0-md5: fc43e8401f9196082f86058a19c23148
 Source1:       named.init
 Source2:       named.sysconfig
 Source3:       named.logrotate
@@ -57,7 +58,7 @@ Source4:      http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-ma
 Source6:       %{name}-hip.tar.gz
 # Source6-md5: 62a8a67f51ff8db9fe815205416a1f62
 Source7:       https://www.internic.net/domain/named.root
-# Source7-md5: 544504d19e2b71c259d2a09d231533aa
+# Source7-md5: f9de7bc80f01f31c31a4550256ab617e
 Source8:       %{name}-127.0.0.zone
 Source9:       %{name}-localhost.zone
 Source10:      %{name}-named.conf
@@ -87,6 +88,7 @@ BuildRequires:        libuv-devel >= 1.37.0
 BuildRequires: libxml2-devel >= 1:2.6.0
 %{?with_lmdb:BuildRequires:    lmdb-devel}
 %{?with_geoip:BuildRequires:   libmaxminddb-devel}
+%{?with_doh:BuildRequires:     nghttp2-devel >= 1.6.0}
 %{?with_ssl:BuildRequires:     openssl-devel >= 1.0.0}
 BuildRequires: pkgconfig
 BuildRequires: python3-devel >= 1:3.2
@@ -95,6 +97,8 @@ BuildRequires:        readline-devel
 BuildRequires: rpm >= 4.4.9-56
 BuildRequires: rpmbuild(macros) >= 1.647
 BuildRequires: sphinx-pdg
+BuildRequires: tar >= 1:1.22
+BuildRequires: xz
 BuildRequires: zlib-devel
 %if %{with dnstap}
 BuildRequires: fstrm-devel
@@ -117,7 +121,9 @@ Provides:   group(named)
 Provides:      nameserver
 Provides:      user(named)
 Obsoletes:     caching-nameserver
-Conflicts:     %{name}-chroot
+Obsoletes:     openldap-schema-bind < 7:9.18.0
+Obsoletes:     python3-isc < 7:9.18.0
+Conflicts:     bind-chroot
 Conflicts:     logrotate < 3.8.0
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -292,6 +298,7 @@ Group:              Libraries
 Requires:      json-c >= 0.11
 Requires:      libuv >= 1.37.0
 Requires:      libxml2 >= 1:2.6.0
+%{?with_doh:Requires:  nghttp2-libs >= 1.6.0}
 
 %description libs
 The bind-libs package contains all libraries required for running BIND
@@ -390,6 +397,7 @@ BIND.
        CFLAGS="-D_GNU_SOURCE=1 %{rpmcflags} %{rpmcppflags}" \
        LDFLAGS="%{rpmldflags}" \
        %{?with_dnstap:--enable-dnstap} \
+       %{!?with_doh:--disable-doh} \
        %{!?with_epoll:--disable-epoll --disable-devpoll} \
        --enable-full-report \
        --enable-largefile \
@@ -427,6 +435,8 @@ install -d $RPM_BUILD_ROOT{%{_includedir},%{_bindir},%{_sbindir},%{_includedir}}
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/bind/filter-*.la
+
 bzip2 -dc %{SOURCE4} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
 %{__rm} $RPM_BUILD_ROOT%{_mandir}/README.named-non-english-man-pages
 %{__mv} $RPM_BUILD_ROOT%{_mandir}/ja/man8/nslookup.8 $RPM_BUILD_ROOT%{_mandir}/ja/man1/nslookup.1