diff --git a/ldns.spec b/ldns.spec index a6af7f2..b782bab 100644 --- a/ldns.spec +++ b/ldns.spec @@ -1,18 +1,22 @@ %global _hardened_build 1 %bcond_without python3 -%if 0%{?fedora} > 1 || 0%{?rhel} <= 7 -%bcond_without python2 -%else +%if 0%{?rhel} > 7 %bcond_with python2 +%else +%bcond_without python2 %endif %bcond_without perl %bcond_without ecdsa +%if 0%{?fedora} >= 26 || 0%{?rhel} > 7 %bcond_without eddsa +%bcond_without dane_ta +%else +%bcond_with eddsa +%bcond_with dane_ta +%endif # GOST is not allowed in Fedora/RHEL due to legal reasons (not NIST ECC) %bcond_with gost -# Useful to build against openssl 1.0 -%bcond_with dane %{?!snapshot: %global snapshot 0} @@ -37,7 +41,7 @@ Summary: Low-level DNS(SEC) library with API Name: ldns Version: 1.7.0 -Release: 15%{?dist} +Release: 16%{?dist} License: BSD Url: http://www.nlnetlabs.nl/%{name}/ @@ -55,10 +59,10 @@ BuildRequires: automake %endif BuildRequires: libpcap-devel -%if %{with dane} -BuildRequires: openssl-devel >= 1.0.2k -%else +%if %{with dane_ta} BuildRequires: openssl-devel >= 1.1.0 +%else +BuildRequires: openssl-devel >= 1.0.2k %endif BuildRequires: gcc-c++ BuildRequires: doxygen @@ -207,7 +211,7 @@ export CFLAGS CXXFLAGS LDFLAGS %global enable_eddsa --disable-ed25519 --disable-ed448 %endif -%if %{with dane} +%if ! %{with dane_ta} %global disable_dane_ta --disable-dane-ta-usage %endif @@ -354,6 +358,9 @@ rm -rf doc/man %doc doc %changelog +* Wed Apr 11 2018 Petr Menšík - 1.7.0-16 +- Make DANE TA usage more clear, autoconfigure for old fedora + * Wed Feb 21 2018 Petr Menšík - 1.7.0-15 - Experimental support for ed25519 and ed448