BR: rpmbuild(macros) >= 1.710

[packages/python-urlgrabber.git] / python-urlgrabber.spec

diff --git a/python-urlgrabber.spec b/python-urlgrabber.spec
index f9522d048cf402b31f349632f394c1e36c6ed780..1132292509aef98bd8510871f0b6880521268471 100644 (file)
--- a/python-urlgrabber.spec
+++ b/python-urlgrabber.spec
@@ -1,26 +1,23 @@
-# 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:       7
 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: rpmbuild(macros) >= 1.710
 BuildRequires: python >= 1:2.5
 BuildRequires: python-devel
 BuildRequires: python-pycurl >= 7.19
 BuildRequires: rpm-pythonprov
 %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)
 
@@ -38,17 +35,15 @@ uwierzytelnianie, proxy itp.
 %prep
 %setup -q -n urlgrabber-%{version}
 %patch1 -p1
-%patch2 -p1
 
 %build
-%{__python} setup.py build
+%py_build
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%{__python} setup.py install \
-       --root=$RPM_BUILD_ROOT
+%py_install
 
-rm -rf $RPM_BUILD_ROOT%{_docdir}/urlgrabber-%{version}
+%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/urlgrabber-%{version}
 %py_postclean
 
 %clean
@@ -59,4 +54,4 @@ rm -rf $RPM_BUILD_ROOT
 %doc ChangeLog README TODO
 %attr(755,root,root) %{_bindir}/urlgrabber
 %{py_sitescriptdir}/urlgrabber
-%{py_sitescriptdir}/*.egg-info
+%{py_sitescriptdir}/urlgrabber-*.egg-info