- Split with_ecc macro in with_ecdsa and with_gost - and disable gost

ldns.spec

@@ -1,7 +1,9 @@
 %global _hardened_build 1
 %{?!with_python:      %global with_python      1}
 %{?!with_perl:        %global with_perl        1}
-%{?!with_ecc:        %global with_ecc          1}
+%{?!with_ecdsa:        %global with_ecdsa          1}
+# GOST is not allowed in Fedora/RHEL due to legal reasons (not NIST ECC)
+%{?!with_gost:        %global with_gost        0}
 
 %if %{with_python}
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
@@ -140,11 +142,14 @@ export CFLAGS CXXFLAGS LDFLAGS
 %configure \
   --disable-rpath \
   --disable-static \
-%if %{with_ecc}
+%if %{with_gost}
   --enable-gost \
-  --enable-ecdsa \
 %else
   --disable-gost \
+%endif
+%if %{with_ecdsa}
+  --enable-ecdsa \
+%else
   --disable-ecdsa \
 %endif
 %if %{with_python}
@@ -157,11 +162,14 @@ export CFLAGS CXXFLAGS LDFLAGS
 pushd drill
 %configure \
   --disable-rpath \
-%if %{with_ecc}
+%if %{with_gost}
   --enable-gost \
-  --enable-ecdsa \
 %else
   --disable-gost \
+%endif
+%if %{with_ecdsa}
+  --enable-ecdsa \
+%else
   --disable-ecdsa \
 %endif
   --with-ca-file=/etc/pki/tls/certs/ca-bundle.trust.crt \
@@ -172,11 +180,14 @@ popd
 pushd examples
 %configure \
   --disable-rpath \
-%if %{with_ecc}
+%if %{with_gost}
   --enable-gost \
-  --enable-ecdsa \
 %else
   --disable-gost \
+%endif
+%if %{with_ecdsa}
+  --enable-ecdsa \
+%else
   --disable-ecdsa \
 %endif
   --with-ca-file=/etc/pki/tls/certs/ca-bundle.trust.crt \
@@ -268,6 +279,9 @@ rm -rf %{buildroot}
 %doc doc
 
 %changelog
+* Mon Apr 27 2015 Paul Wouters <pwouters@redhat.com> - 1.6.17-12
+- Split with_ecc macro in with_ecdsa and with_gost - and disable gost
+
 * Mon Nov 24 2014 Paul Wouters <pwouters@redhat.com> - 1.6.17-11
 - Only cond_without sets "with ", so use underscores
 - multilib.patch was setting LIBDIR_SEC once without leading /