- rel 3; more fixes for 3512; run test suite

[packages/unbound.git] / unbound.spec

diff --git a/unbound.spec b/unbound.spec
index e59ce62b66cca9489335de03e84fc2ec24489024..24a1d95c9533422a210c3985b49a4556d1961b72 100644 (file)
--- a/unbound.spec
+++ b/unbound.spec
@@ -2,42 +2,48 @@
 # Conditional build:
 %bcond_without python  # Python binding
 %bcond_with    dnstap  # dnstap replication support
+%bcond_with    systemd # systemd support
+%bcond_without tests
 #
 Summary:       Recursive, validating DNS resolver
 Summary(pl.UTF-8):     Rekurencyjny, weryfikujący resolver DNS
 Name:          unbound
-Version:       1.5.8
-Release:       1
+Version:       1.6.8
+Release:       3
 License:       BSD
 Group:         Applications/Network
 Source0:       http://www.unbound.net/downloads/%{name}-%{version}.tar.gz
-# Source0-md5: 1c34282bae0c625b86374ee9caaef6f7
+# Source0-md5: c9d26cef224b10705229d5072142636c
 Source1:       %{name}.init
 Source2:       %{name}.service
 Source3:       https://data.iana.org/root-anchors/icannbundle.pem
-# Source3-md5: 1ad315c80d044eca2da29785eee6f7c3
+# Source3-md5: 24a426d59b61524623695f1b849f159b
 Source4:       ftp://ftp.internic.net/domain/named.cache
-# Source4-md5: b2afc34d106e104730b63876c9a07caf
+# Source4-md5: f4a35c0015a679d1605c18d40aad7506
 Patch0:                %{name}-default_trust_anchor.patch
 Patch1:                %{name}-sh.patch
 Patch2:                %{name}-pythondir.patch
+Patch3:                %{name}-flex.patch
+Patch4:                unbound-bug-3512.patch
 URL:           http://unbound.net/
 BuildRequires: autoconf >= 2.56
 BuildRequires: automake
+BuildRequires: bison
 BuildRequires: expat-devel
+BuildRequires: flex
 %{?with_dnstap:BuildRequires:  fstrm-devel}
 BuildRequires: libevent-devel
 BuildRequires: libtool
 BuildRequires: openssl-devel >= 1.0
 %{?with_dnstap:BuildRequires:  protobuf-c-devel}
-BuildRequires: rpmbuild(macros) >= 1.228
+BuildRequires: rpmbuild(macros) >= 1.671
+%{?with_systemd:BuildRequires: systemd-devel}
 %if %{with python}
 BuildRequires: python-devel >= 1:2.4.0
 BuildRequires: swig-python
 %endif
-Requires(post,preun):  /sbin/chkconfig
-BuildRequires: rpmbuild(macros) >= 1.671
 Provides:      user(unbound)
+Requires(post,preun):  /sbin/chkconfig
 Requires(postun):      /usr/sbin/userdel
 Requires(pre): /bin/id
 Requires(pre): /usr/sbin/useradd
@@ -124,6 +130,8 @@ Pythonowy interfejs do biblioteki unbound.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
+%patch4 -p1
 
 %build
 %{__libtoolize}
@@ -132,6 +140,7 @@ Pythonowy interfejs do biblioteki unbound.
 %{__autoheader}
 %configure \
        %{?with_dnstap:--enable-dnstap} \
+       %{?with_systemd:--enable-systemd} \
        %{__with_without python pyunbound} \
        %{__with_without python pythonmodule} \
        --with-pidfile=/run/%{name}.pid \
@@ -163,6 +172,10 @@ touch $RPM_BUILD_ROOT/var/lib/%{name}/root.key
 %py_postclean
 %endif
 
+%if %{with tests}
+%{__make} check
+%endif
+
 %clean
 rm -rf $RPM_BUILD_ROOT