Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci
In directory vz-cvs-3.sog:/tmp/cvs-serv24258
Modified Files:
rpy2-py.info rpy2-py.patch
Log Message:
New upstream version
Index: rpy2-py.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/rpy2-py.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- rpy2-py.patch 25 Sep 2010 07:21:21 -0000 1.4
+++ rpy2-py.patch 29 Sep 2011 01:01:06 -0000 1.5
@@ -1,35 +1,16 @@
-diff -Nurd -x'*~' rpy2-2.1.4.orig/setup.py rpy2-2.1.4/setup.py
---- rpy2-2.1.4.orig/setup.py 2010-06-15 16:06:56.000000000 -0400
-+++ rpy2-2.1.4/setup.py 2010-09-25 03:14:50.000000000 -0400
-@@ -127,10 +127,10 @@
- raise SystemExit('Error: trouble with R configuration %s' %d)
- self.include_dirs.extend(include_dirs)
-
-- extra_link_args = get_rconfig(r_home, '--ldflags') +\
-+ extra_link_args = get_rconfig(r_home, '--ldflags', splt=True) +\
- get_rconfig(r_home, 'LAPACK_LIBS',
-- allow_empty=True) +\
-- get_rconfig(r_home, 'BLAS_LIBS')
-+ allow_empty=True, splt=True) +\
-+ get_rconfig(r_home, 'BLAS_LIBS', splt=True)
-
- for e in self.extensions:
- e.extra_compile_args.extend(extra_link_args)
-@@ -168,7 +168,7 @@
- return 0
- return cmp_version(x[1:], y[1:])
-
--def get_rconfig(r_home, about, allow_empty = False):
-+def get_rconfig(r_home, about, allow_empty = False, splt=False):
- r_exec = os.path.join(r_home, 'bin', 'R')
- cmd = '"'+r_exec+'" CMD config '+about
- rp = os.popen(cmd)
-@@ -197,6 +197,8 @@
- if os.path.exists(rconfig):
- return ("-l"+rconfig,)
- raise Exception(cmd + '\nreturned\n' + rconfig)
-+ if splt:
-+ return tuple(rconfig_m.groups()[0].split())
- return rconfig_m.groups()
-
-
+diff -ruN rpy2-2.2.2-orig/setup.py rpy2-2.2.2/setup.py
+--- rpy2-2.2.2-orig/setup.py 2011-09-27 14:45:35.000000000 +0900
++++ rpy2-2.2.2/setup.py 2011-09-27 18:31:12.000000000 +0900
+@@ -267,9 +267,9 @@
+ rc += RConfig(library = substring)
+ ok = True
+ break
+- if not ok:
+- raise ValueError('Invalid substring\n' + substring
+- + '\nin string\n' + string)
++ # if not ok:
++ # raise ValueError('Invalid substring\n' + substring
++ # + '\nin string\n' + string)
+ return rc
+
+ def __repr__(self):
Index: rpy2-py.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/rpy2-py.info,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- rpy2-py.info 25 Sep 2010 07:21:21 -0000 1.8
+++ rpy2-py.info 29 Sep 2011 01:01:05 -0000 1.9
@@ -1,30 +1,34 @@
Info2: <<
Package: rpy2-py%type_pkg[python]
-Version: 2.1.4
+Version: 2.2.2
Revision: 1
Description: Python module to access R functions
License: OSI-Approved
Homepage: http://rpy.sourceforge.net/rpy2.html
-Maintainer: Monic Polynomial <[email protected]>
+Maintainer: BABA Yoshihiko <[email protected]>
-Type: python (2.4 2.5 2.6 2.7)
-Distribution: <<
-(%type_pkg[python] = 24) 10.4,
-<<
+Type: python (2.6 2.7)
+Distribution: 10.4, 10.5, 10.6
BuildDepends: fink (>= 0.24.12-1)
Depends: python%type_pkg[python], r-base (>= 2.7.0), numpy-py%type_pkg[python]
(>= 1.3.0-7)
Source: http://pypi.python.org/packages/source/r/rpy2/rpy2-%v.tar.gz
-Source-MD5: cf4e0d80ba498a6d76f107531966478d
+Source-MD5: 7690d8fa747e62cd27cfacfa45f4a07b
PatchFile: %{ni}.patch
-PatchFile-MD5: 011d3974f5ba8a1c0daafe1b0ed5717c
+PatchFile-MD5: 6c378419172db1aeaea29d6c821b8421
+PatchScript: sed 's|@PREFIX@|%p|g' < %{PatchFile} | patch -p1
-CompileScript: %p/bin/python%type_raw[python] setup.py build
+SetLDFLAGS: -L%p/Library/Frameworks/R.framework/Versions/2.13/Resources/lib
-undefined dynamic_lookup
+
+CompileScript: <<
+#!/bin/bash -ev
+ %p/bin/python%type_raw[python] setup.py build
--r-home=%p/Library/Frameworks/R.framework/Resources
+<<
InstallScript: <<
- export RHOMES='%p/Library/Frameworks/R.framework/Resources'
- %p/bin/python%type_raw[python] setup.py install --root %d
+#!/bin/bash -ev
+ %p/bin/python%type_raw[python] setup.py install --no-compile --prefix=%p
--exec-prefix=%i --install-data=%i/lib/python%type_raw[python]
<<
DocFiles: AUTHORS GPL_LICENSE LGPL_LICENSE MPL_LICENSE NEWS PKG-INFO README
------------------------------------------------------------------------------
All the data continuously generated in your IT infrastructure contains a
definitive record of customers, application performance, security
threats, fraudulent activity and more. Splunk takes this data and makes
sense of it. Business sense. IT sense. Common sense.
http://p.sf.net/sfu/splunk-d2dcopy1
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
