[packages/python-pycurl] - updated to 7.19.0.2 - updated no-static-libs patch to different approach: pycurl needs to check al
qboosh
qboosh at pld-linux.org
Thu Oct 17 17:55:00 CEST 2013
commit 65ea823fdebe453e231a1322c98dba4b52752e55
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Thu Oct 17 17:54:19 2013 +0200
- updated to 7.19.0.2
- updated no-static-libs patch to different approach: pycurl needs to check all dependent
libraries to catch kind of SSL library; but take "static libs" part from pkg-config,
which returns all libraries in -l form, not from curl-config which returns static
library path; rely on as-needed machanism to drop unwanted libs from linking
python-pycurl-no-static-libs.patch | 25 +++++++++++++------------
python-pycurl.spec | 17 +++++++++--------
2 files changed, 22 insertions(+), 20 deletions(-)
---
diff --git a/python-pycurl.spec b/python-pycurl.spec
index 27f2d32..2f455a0 100644
--- a/python-pycurl.spec
+++ b/python-pycurl.spec
@@ -1,6 +1,3 @@
-# TODO
-# - as-needed fix: drop libssh2 dep from curl
-
# During its initialization, PycURL checks that the actual libcurl version
# is not lower than the one used when PycURL was built.
# Yes, that should be handled by library versioning (which would then get
@@ -12,15 +9,16 @@
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
-Release: 8
+Version: 7.19.0.2
+Release: 1
License: LGPL v2 or MIT-like
Group: Libraries/Python
Source0: http://pycurl.sourceforge.net/download/%{module}-%{version}.tar.gz
-# Source0-md5: 919d58fe37e69fe87ce4534d8b6a1c7b
+# Source0-md5: 518be33976dbc6838e42495ada64b43f
Patch0: %{name}-no-static-libs.patch
URL: http://pycurl.sourceforge.net/
BuildRequires: curl-devel >= 7.19
+BuildRequires: pkgconfig >= 1:0.20
BuildRequires: python >= 1:2.5
BuildRequires: python-devel >= 1:2.5
BuildRequires: python-modules >= 1:2.5
@@ -73,9 +71,12 @@ Moduł zawierający przykładowe programy do modułu Pythona pycurl.
%prep
%setup -q -n %{module}-%{version}
-%patch0 -p0
+%patch0 -p1
%build
+CC="%{__cc}" \
+CFLAGS="%{rpmcflags}" \
+LDFLAGS="%{rpmldflags}" \
%{__python} setup.py build \
--debug
@@ -97,7 +98,7 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
-%doc COPYING2 ChangeLog README TODO
+%doc COPYING2 ChangeLog README.rst TODO
%attr(755,root,root) %{py_sitedir}/pycurl.so
%dir %{py_sitedir}/curl
%{py_sitedir}/curl/*.py[co]
diff --git a/python-pycurl-no-static-libs.patch b/python-pycurl-no-static-libs.patch
index c1410dc..58ee346 100644
--- a/python-pycurl-no-static-libs.patch
+++ b/python-pycurl-no-static-libs.patch
@@ -1,12 +1,13 @@
---- setup.py~ 2008-04-22 17:00:45.000000000 +0300
-+++ setup.py 2008-07-03 21:53:36.000000000 +0300
-@@ -97,8 +97,7 @@
- else:
- extra_compile_args.append(e)
- libs = split_quoted(
-- os.popen("'%s' --libs" % CURL_CONFIG).read()+\
-- os.popen("'%s' --static-libs" % CURL_CONFIG).read())
-+ os.popen("'%s' --libs" % CURL_CONFIG).read())
- for e in libs:
- if e[:2] == "-l":
- libraries.append(e[2:])
+--- 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:
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/python-pycurl.git/commitdiff/65ea823fdebe453e231a1322c98dba4b52752e55
More information about the pld-cvs-commit
mailing list