Merge branch 'master' of ssh://pkgs.fedoraproject.org/ldns

Conflicts:
	ldns.spec

ldns.spec

@@ -5,7 +5,7 @@
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 %endif
 
-Summary: Lowlevel DNS(SEC) library with API
+Summary: Low-level DNS(SEC) library with API
 Name: ldns
 Version: 1.6.14
 Release: 1%{?dist}
@@ -62,11 +62,11 @@ Python extensions for ldns
 %endif
 
 (cd drill ; %configure --disable-rpath --disable-static --disable-gost \
-   --disable-ecdsa --with-ldns=%{buildroot}/lib/ \
+   --disable-ecdsa \
    --with-ca-file=/etc/pki/tls/certs/ca-bundle.trust.crt --with-ca-path=/etc/pki/tls/certs/
 )
 (cd examples ; %configure --disable-rpath --disable-static --disable-gost \
-   --disable-ecdsa --with-ldns=%{buildroot}/lib/  \
+   --disable-ecdsa \
    --with-ca-file=/etc/pki/tls/certs/ca-bundle.trust.crt --with-ca-path=/etc/pki/tls/certs/
 )
 
@@ -128,6 +128,9 @@ rm -rf %{buildroot}
 - Removed merged in patch
 - Added new dependancy on ca-certificates for ldns-dane PKIX validation
 
+* Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.6.13-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
 * Fri Jun 01 2012 Paul Wouters <pwouters@redhat.com> - 1.6.13-2
 - Added reworked ldns-read-zone patch from trunk
   (adds -p for SOA padding, and -o for zeroizing timestamps/sigs)