Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/libs/pythonmods
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv13177
Modified Files:
pycurl-py.info pycurl-py.patch
Log Message:
New upstream pycurl 7.19.0.1.
Tests now use nose but we are missing cherrypy.wsgiserver which is needed for
tests. Other tests seem to work.
Index: pycurl-py.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.7/stable/main/finkinfo/libs/pythonmods/pycurl-py.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- pycurl-py.patch 26 Jul 2011 03:23:28 -0000 1.1
+++ pycurl-py.patch 30 Sep 2013 15:36:33 -0000 1.2
@@ -1,26 +1,16 @@
-diff -ru pycurl-7.19.0.orig/setup.py pycurl-7.19.0/setup.py
---- pycurl-7.19.0.orig/setup.py 2008-09-09 13:40:34.000000000 -0400
-+++ pycurl-7.19.0/setup.py 2008-09-30 09:45:54.000000000 -0400
-@@ -97,7 +97,8 @@
- else:
- extra_compile_args.append(e)
- libs = split_quoted(
-- os.popen("'%s' --libs" % CURL_CONFIG).read()+\
-+ os.popen("'%s' --libs" % CURL_CONFIG).read())
-+ static_libs = split_quoted(
- os.popen("'%s' --static-libs" % CURL_CONFIG).read())
- for e in libs:
- if e[:2] == "-l":
-@@ -110,6 +111,12 @@
- library_dirs.append(e[2:])
- else:
- extra_link_args.append(e)
-+ for e in static_libs:
-+ if e[:2] == "-l":
-+ if e[2:] == 'ssl':
-+ define_macros.append(('HAVE_CURL_OPENSSL', 1))
-+ if e[2:] == 'gnutls':
-+ define_macros.append(('HAVE_CURL_GNUTLS', 1))
+diff -ru pycurl-7.19.0.1.orig/setup.py pycurl-7.19.0.1/setup.py
+--- pycurl-7.19.0.1.orig/setup.py 2013-09-25 05:41:23.000000000 -0400
++++ pycurl-7.19.0.1/setup.py 2013-09-30 10:55:41.000000000 -0400
+@@ -128,11 +128,9 @@
for e in split_quoted(os.popen("'%s' --features" % CURL_CONFIG).read()):
if e == 'SSL':
define_macros.append(('HAVE_CURL_SSL', 1))
++ define_macros.append(('HAVE_CURL_OPENSSL', 1))
+ if not libraries:
+ libraries.append("curl")
+- # Add extra compile flag for MacOS X
+- if sys.platform[:-1] == "darwin":
+- extra_link_args.append("-flat_namespace")
+
+
+
###############################################################################
Index: pycurl-py.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.7/stable/main/finkinfo/libs/pythonmods/pycurl-py.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- pycurl-py.info 26 Jul 2011 03:23:28 -0000 1.1
+++ pycurl-py.info 30 Sep 2013 15:36:33 -0000 1.2
@@ -1,6 +1,6 @@
Info2: <<
Package: pycurl-py%type_pkg[python]
-Version: 7.19.0
+Version: 7.19.0.1
Revision: 1
Type: python (2.6 2.7)
Description: Python bindings for libcurl
@@ -16,26 +16,31 @@
Homepage: http://pycurl.sourceforge.net/
Source: http://pycurl.sourceforge.net/download/pycurl-%v.tar.gz
-Source-MD5: 919d58fe37e69fe87ce4534d8b6a1c7b
+Source-MD5: bf737819edcd5b3d9d93b9fc4cd8e003
-PatchFile: %{Ni}.patch
-PatchFile-MD5: 0da644701607d84870b3cc6126457b41
+PatchFile: %{ni}.patch
+PatchFile-MD5: 01ffd60bc5520d63aab007b804f2d99d
-Depends: python%type_pkg[python], libcurl4-shlibs (>= 7.18.2)
-BuildDepends: libcurl4 (>= 7.18.2), system-openssl-dev, fink (>= 0.24.12)
+Depends: python%type_pkg[python], libcurl4-shlibs (>= 7.18.2),
openssl100-shlibs (>= 1.0.1e)
+BuildDepends: libcurl4 (>= 7.18.2), openssl100-dev (>= 1.0.1e), fink (>=
0.24.12)
NoSetCPPFLAGS: true
NoSetLDFLAGS: true
-SetLDFLAGS: -L%p/lib/system-openssl/lib -lcrypto
+SetLDFLAGS: -L%p/lib -lcrypto
CompileScript: <<
- %p/bin/python%type_raw[python] setup.py build
--curl-config=%p/bin/curl-config --openssl-dir=%p/lib/system-openssl
+ %p/bin/python%type_raw[python] setup.py build
--curl-config=%p/bin/curl-config --openssl-dir=%p
<<
InstallScript: <<
%p/bin/python%type_raw[python] setup.py install --root %d
/bin/mv %i/share/doc/pycurl %i/share/doc/pycurl-py%type_pkg[python]
<<
-InfoTest: <<
- TestScript: %p/bin/python%type_raw[python] tests/test_internals.py -q
|| exit 2
-<<
+# Tests also need cherrypy.wsgiserver.
+#InfoTest: <<
+# TestDepends: nose-py%type_pkg[python], bottle-py%type_pkg[python]
+# TestScript: <<
+# mkdir -p tests/tmp
+# PYTHONPATH=`ls -d build/lib.*` nosetests-%type_raw[python] ||
exit 2
+# <<
+#<<
<<
------------------------------------------------------------------------------
October Webinars: Code for Performance
Free Intel webinars can help you accelerate application performance.
Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from
the latest Intel processors and coprocessors. See abstracts and register >
http://pubads.g.doubleclick.net/gampad/clk?id=60133471&iu=/4140/ostg.clktrk
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
