commit c50d3face5f472b557be3aeb5b4a7a8f3b091d10
Author: Jakub Bogusz <[email protected]>
Date: Sun Feb 9 09:04:13 2014 +0100
- updated to 7.19.3.1
- updated no-static-libs patch
python-pycurl-no-static-libs.patch | 26 +++++++++++++-------------
python-pycurl.spec | 10 ++++++----
2 files changed, 19 insertions(+), 17 deletions(-)
---
diff --git a/python-pycurl.spec b/python-pycurl.spec
index 2f455a0..6c160d8 100644
--- a/python-pycurl.spec
+++ b/python-pycurl.spec
@@ -9,12 +9,12 @@
Summary: Free and easy-to-use client-side URL transfer library
Summary(pl.UTF-8): Łatwa w użyciu biblioteka obsługi URL od strony klienta
Name: python-%{module}
-Version: 7.19.0.2
+Version: 7.19.3.1
Release: 1
License: LGPL v2 or MIT-like
Group: Libraries/Python
Source0:
http://pycurl.sourceforge.net/download/%{module}-%{version}.tar.gz
-# Source0-md5: 518be33976dbc6838e42495ada64b43f
+# Source0-md5: 6df8fa7fe8b680d93248da1f8d4fcd12
Patch0: %{name}-no-static-libs.patch
URL: http://pycurl.sourceforge.net/
BuildRequires: curl-devel >= 7.19
@@ -98,7 +98,7 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
-%doc COPYING2 ChangeLog README.rst TODO
+%doc AUTHORS COPYING-MIT ChangeLog README.rst RELEASE-NOTES.rst
%attr(755,root,root) %{py_sitedir}/pycurl.so
%dir %{py_sitedir}/curl
%{py_sitedir}/curl/*.py[co]
@@ -106,7 +106,9 @@ rm -rf $RPM_BUILD_ROOT
%files doc
%defattr(644,root,root,755)
-%doc doc/*.html
+# TODO: use rst2html to convert?
+#%doc doc/*.html
+%doc doc/*.rst
%files examples
%defattr(644,root,root,755)
diff --git a/python-pycurl-no-static-libs.patch
b/python-pycurl-no-static-libs.patch
index 58ee346..f2226df 100644
--- a/python-pycurl-no-static-libs.patch
+++ b/python-pycurl-no-static-libs.patch
@@ -1,13 +1,13 @@
---- pycurl-7.19.0.2/setup.py.orig 2013-10-08 14:28:53.000000000 +0200
-+++ pycurl-7.19.0.2/setup.py 2013-10-17 17:48:12.440601971 +0200
-@@ -101,8 +101,8 @@
- # support one or the other of these curl-config options, so gracefully
- # tolerate failure of either, but not both.
- optbuf = ""
-- for option in ["--libs", "--static-libs"]:
-- p = subprocess.Popen("'%s' %s" % (CURL_CONFIG, option), shell=True,
-+ for option in ["--libs", "--static --libs"]:
-+ p = subprocess.Popen("'%s' %s libcurl" % ('pkg-config', option),
shell=True,
- stdout=subprocess.PIPE)
- (stdout, stderr) = p.communicate()
- if p.wait() == 0:
+--- pycurl-7.19.3.1/setup.py.orig 2014-02-08 22:45:35.815908728 +0100
++++ pycurl-7.19.3.1/setup.py 2014-02-09 07:30:52.621252762 +0100
+@@ -147,8 +147,8 @@
+ optbuf = ''
+ sslhintbuf = ''
+ errtext = ''
+- for option in ["--libs", "--static-libs"]:
+- p = subprocess.Popen((CURL_CONFIG, option),
++ for option in ["--libs", "--static --libs"]:
++ p = subprocess.Popen("'%s' %s libcurl" % ('pkg-config', option),
shell=True,
+ stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+ stdout, stderr = p.communicate()
+ if p.wait() == 0:
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/python-pycurl.git/commitdiff/c50d3face5f472b557be3aeb5b4a7a8f3b091d10
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
