rpms/python-adns/FC-5 adns-python-srv.patch, NONE, 1.1 python-adns.spec, 1.7, 1.8

[Mihai Ibanescu (misa)]

Author: misa

Update of /cvs/extras/rpms/python-adns/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29343

Modified Files:
	python-adns.spec 
Added Files:
	adns-python-srv.patch 
Log Message:
Building for FC-5

adns-python-srv.patch:

--- NEW FILE adns-python-srv.patch ---
--- adns-python-1.1.0/adnsmodule.c.orig	2006-05-08 16:23:21.000000000 -0400
+++ adns-python-1.1.0/adnsmodule.c	2006-05-09 11:35:15.000000000 -0400
@@ -88,9 +88,10 @@
 };
 
 static _constant_class adns_rr[] = {
-	{ "typemask", adns__rrt_typemask },
+	{ "typemask", adns_rrt_typemask },
 	{ "deref", adns__qtf_deref },
 	{ "mail822", adns__qtf_mail822 },
+	{ "unknown", adns_r_unknown },
 	{ "none", adns_r_none },
 	{ "A", adns_r_a },
 	{ "NSraw", adns_r_ns_raw },
@@ -106,6 +107,8 @@
 	{ "TXT", adns_r_txt },
 	{ "RPraw", adns_r_rp_raw },
 	{ "RP", adns_r_rp },
+	{ "SRVraw", adns_r_srv_raw },
+	{ "SRV", adns_r_srv },
 	{ "ADDR", adns_r_addr },
 	{ NULL, 0 }
 };
@@ -176,6 +179,17 @@
 			  addrs);
 	return o;
 }
+
+static PyObject *
+interpret_srv(
+	adns_rr_srvraw *srvrr
+	)
+{
+	PyObject *o;
+	o = Py_BuildValue("iiis", srvrr->priority, srvrr->weight, srvrr->port,
+		srvrr->host);
+	return o;
+}
 	
 static PyObject *
 interpret_answer(
@@ -184,7 +198,7 @@
 {
 	PyObject *o, *rrs;
 	int i;
-	adns_rrtype t = answer->type & adns__rrt_typemask;
+	adns_rrtype t = answer->type & adns_rrt_typemask;
 	adns_rrtype td = answer->type & adns__qtf_deref;
 
 	rrs = PyTuple_New(answer->nrrs);
@@ -273,6 +287,9 @@
 				a = Py_BuildValue("ss", v->array[0], v->array[1]);
 			}
 			break;
+		case adns_r_srv_raw:
+			a = interpret_srv((answer->rrs.srvraw+i));
+			break;
 		default:
 			a = Py_None;
 			Py_INCREF(a);


Index: python-adns.spec
===================================================================
RCS file: /cvs/extras/rpms/python-adns/FC-5/python-adns.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- python-adns.spec	13 Apr 2005 01:25:11 -0000	1.7
+++ python-adns.spec	15 May 2006 14:00:30 -0000	1.8
@@ -4,16 +4,17 @@
 
 Name:           python-adns
 Version:        1.1.0
-Release:        1
+Release:        3%{?dist}
 
 Summary:        Python interface for the GNU adns library
 Group:          Development/Languages
 License:        GPL
 URL:            http://dustman.net/andy/python/adns-python
 Source0:        http://dustman.net/andy/python/adns-python/1.1.0/adns-python-1.1.0.tar.gz
+Patch0:         adns-python-srv.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  python-devel, adns-devel
+BuildRequires:  python-devel, adns-devel >= 1.2
 Requires:       python >= %{pyver}, python < %{pynext}
 
 %description
@@ -22,6 +23,7 @@
 
 %prep
 %setup -q -n %{srcname}-%{version}
+%patch0 -p1 -b .srv
 
 %build
 env CFLAGS="$RPM_OPT_FLAGS" python setup.py build
@@ -41,6 +43,11 @@
 %ghost %{_libdir}/python%{pyver}/site-packages/*.pyo
 
 %changelog
+* Tue May  9 2006 Mihai Ibanescu <misa at redhat.com> 1.1.0-3
+- added patch to make it compile with adns >= 1.2 (adns__rrt_typemask was
+  renamed to adns_rrt_typemask). The patch also adds support for SRV records
+  (adns 1.2 has that, just need them exposed in the bindings).
+
 * Wed Apr 13 2005 Colin Charles <colin at fedoraproject.org> - 1.1.0-1
 - new upstream 1.1.0 release