packages: python-urlgrabber/python-urlgrabber.spec - resolv.conf hack fixed...

[glen]

Author: glen                         Date: Sun Feb  7 13:32:19 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- resolv.conf hack fixed in c-ares; rel 3

---- Files affected:
packages/python-urlgrabber:
   python-urlgrabber.spec (1.18 -> 1.19) 

---- Diffs:

================================================================
Index: packages/python-urlgrabber/python-urlgrabber.spec
diff -u packages/python-urlgrabber/python-urlgrabber.spec:1.18 packages/python-urlgrabber/python-urlgrabber.spec:1.19
--- packages/python-urlgrabber/python-urlgrabber.spec:1.18	Wed Feb  3 23:37:21 2010
+++ packages/python-urlgrabber/python-urlgrabber.spec	Sun Feb  7 14:32:14 2010
@@ -1,19 +1,15 @@
 # $Revision$, $Date$
-# TODO
-# - find better solution for unreadable /etc/resolv.conf in pycurl
-#   the problem is actgually in curl-libs, util_curl_new() returns NULL in that case
 Summary:	A high-level cross-protocol url-grabber
 Summary(pl.UTF-8):	Wysokopoziomowa biblioteka do wychwytywania URL-i do wielu protokołów
 Name:		python-urlgrabber
 Version:	3.9.1
-Release:	2
+Release:	3
 Epoch:		1
 License:	LGPL v2.1+
 Group:		Libraries/Python
 Source0:	http://urlgrabber.baseurl.org/download/urlgrabber-%{version}.tar.gz
 # Source0-md5:	00c8359bf71062d0946bacea521f80b4
 Patch1:		urlgrabber-HEAD.patch
-Patch2:		urlgrabber-pycurl-resolv.conf-hack.patch
 URL:		http://urlgrabber.baseurl.org/
 BuildRequires:	python >= 1:2.5
 BuildRequires:	python-devel
@@ -22,6 +18,7 @@
 %pyrequires_eq	python-libs
 Requires:	python-pycurl >= 7.19
 Provides:	urlgrabber
+Conflicts:	c-ares < 1.6.0-2
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -39,7 +36,6 @@
 %prep
 %setup -q -n urlgrabber-%{version}
 %patch1 -p1
-%patch2 -p1
 
 %build
 %{__python} setup.py build
@@ -68,6 +64,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.19  2010/02/07 13:32:14  glen
+- resolv.conf hack fixed in c-ares; rel 3
+
 Revision 1.18  2010/02/03 22:37:21  glen
 - builders /etc/resolv.conf hack; rel 2
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/python-urlgrabber/python-urlgrabber.spec?r1=1.18&r2=1.19&f=u