Merge branch 'master' into el5/master

Conflicts:
	python-dns.spec

.gitignore

@@ -4,3 +4,7 @@ dnspython-1.8.0.tar.gz.asc
 /dnspython-1.9.1.tar.gz.asc
 /dnspython-1.9.2.tar.gz
 /dnspython-1.9.2.tar.gz.asc
+/dnspython-1.9.3.tar.gz
+/dnspython-1.9.3.tar.gz.asc
+/dnspython-1.9.4.tar.gz
+/dnspython-1.9.4.tar.gz.asc

python-dns.spec

@@ -11,8 +11,8 @@
 
 
 Name:           python-dns
-Version:        1.9.2
+Version:        1.9.4
-Release:        2%{?dist}
+Release:        1%{?dist}
 Summary:        DNS toolkit for Python
 
 Group:          Development/Languages
@@ -145,6 +145,44 @@ rm -rf %{buildroot}
 %endif
 
 %changelog
+* Mon Mar 28 2011 Jeffrey C. Ollie <jeff@ocjtech.us> - 1.9.4-1
+-
+- dnspython 1.9.4 has been released and is available at
+- http://www.dnspython.org/kits/1.9.4/
+-
+- There is no new functionality in this release; just a few bug fixes
+- in RRSIG and SIG code.
+-
+- I will be eliminating legacy code for earlier versions of DNSSEC in a
+- future release of dnspython.
+
+* Fri Mar 25 2011 Jeffrey C. Ollie <jeff@ocjtech.us> - 1.9.3-1
+-
+- New since 1.9.2:
+-
+-     A boolean parameter, 'raise_on_no_answer', has been added to
+- the query() methods.  In no-error, no-data situations, this
+- parameter determines whether NoAnswer should be raised or not.
+- If True, NoAnswer is raised.  If False, then an Answer()
+- object with a None rrset will be returned.
+-
+- Resolver Answer() objects now have a canonical_name field.
+-
+- Rdata now have a __hash__ method.
+-
+- Bugs fixed since 1.9.2:
+-
+-        Dnspython was erroneously doing case-insensitive comparisons
+- of the names in NSEC and RRSIG RRs.
+-
+- We now use "is" and not "==" when testing what section an RR
+- is in.
+-
+- The resolver now disallows metaqueries.
+
+* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.9.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
 * Thu Dec  2 2010 Jeffrey C. Ollie <jeff@ocjtech.us> - 1.9.2-2
 - Build Python 2.6 subpackage for EPEL 5
 

sources

@@ -1,2 +1,2 @@
-26426043e619d34b47c7c30dc0a02f1c  dnspython-1.9.2.tar.gz
+8a89b7865251c4e9d8ec2f8cc9f8cd78  dnspython-1.9.4.tar.gz
-589f4e0e3221190b2c67b1ef3e1e235f  dnspython-1.9.2.tar.gz.asc
+413d7fc295c6bf03f872938731919c95  dnspython-1.9.4.tar.gz.asc