diff --git a/rpy-1.0.1-FHSinclude.patch b/rpy-1.0.1-FHSinclude.patch deleted file mode 100644 index 3461de9..0000000 --- a/rpy-1.0.1-FHSinclude.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- setup.py.orig 2007-11-27 02:06:32.000000000 +0000 -+++ setup.py 2008-02-04 12:12:20.000000000 +0000 -@@ -139,8 +139,8 @@ - extra_compile_args=["-shared"] - source_files = source_files + ["src/setenv.c"] - else: # unix-like systems, this is known to work for Linux and Solaris -- include_dirs = [ os.path.join(RHOME.strip(), 'include'), -- 'src', '/usr/share/R/include' ] -+ include_dirs = [ os.path.join(RHOME.strip(), 'include'), -+ 'src', '/usr/share/R/include', "/usr/include/R"] - libraries=['R','Rlapack'] - library_dirs = r_libs - runtime_libs = r_libs diff --git a/rpy-1.0.3-R-2.8.0.patch b/rpy-1.0.3-R-2.8.0.patch deleted file mode 100644 index 4cace4c..0000000 --- a/rpy-1.0.3-R-2.8.0.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -up rpy-1.0.3/src/RPy.h.BAD rpy-1.0.3/src/RPy.h ---- rpy-1.0.3/src/RPy.h.BAD 2008-10-26 15:37:50.000000000 -0400 -+++ rpy-1.0.3/src/RPy.h 2008-10-26 15:39:25.000000000 -0400 -@@ -74,8 +74,9 @@ - # endif - #endif /* _WIN32 */ - -+#if R_VERSION < 133120 - #include /* must follow Graphics.h */ -- -+#endif - - /* Missing definitions from Rinterface.h or RStartup.h */ - # define CleanEd Rf_CleanEd diff --git a/rpy-1.0.3-turn-off-debug.patch b/rpy-1.0.3-turn-off-debug.patch deleted file mode 100644 index c04eeb0..0000000 --- a/rpy-1.0.3-turn-off-debug.patch +++ /dev/null @@ -1,42 +0,0 @@ -Revision: 517 - http://rpy.svn.sourceforge.net/rpy/?rev=517&view=rev -Author: warnes -Date: 2008-05-14 10:10:57 -0700 (Wed, 14 May 2008) - -Log Message: ------------ -Turn off debug build flag for default installs, add todo about Rlapack/lapack - -Modified Paths: --------------- - trunk/rpy/setup.py - -Modified: trunk/rpy/setup.py -=================================================================== ---- trunk/rpy/setup.py 2008-05-14 17:05:47 UTC (rev 516) -+++ trunk/rpy/setup.py 2008-05-14 17:10:57 UTC (rev 517) -@@ -30,13 +30,14 @@ - See the files INSTALL.UNIX and INSTALL.WINDOWS for more details. - """ - --DEBUG=True -+DEBUG=False - - import os, os.path, sys, shutil, re - from distutils.core import setup, Extension - from distutils.sysconfig import * - from distutils.errors import * - import rpy_tools -+ - if sys.platform=="win32": - import rpy_wintools - -@@ -85,7 +86,7 @@ - get_config_vars()['OPT'] = '-g -Wall' - else: - # to avoid strict prototypes errors from R includes -- get_config_vars()['OPT'] = '-DNDEBUG -g -O3 -Wall' -+ get_config_vars()['OPT'] = '-DNDEBUG -O3 -Wall' - - # get the Python version - if sys.version[:3] >= '2.2': diff --git a/rpy-1.0.3-use-lapack.patch b/rpy-1.0.3-use-lapack.patch deleted file mode 100644 index b1086e3..0000000 --- a/rpy-1.0.3-use-lapack.patch +++ /dev/null @@ -1,74 +0,0 @@ -Revision: 523 - http://rpy.svn.sourceforge.net/rpy/?rev=523&view=rev -Author: warnes -Date: 2008-05-14 11:31:21 -0700 (Wed, 14 May 2008) - -Log Message: ------------ -Use the 'R CMD config LAPACK_LIBS' command to determin the appropriate link flags for lapack, instead of blindly assuming that '-L/lib -lRlapack' is the correct magic incantation. - -Modified Paths: --------------- - trunk/rpy/rpy_tools.py - trunk/rpy/setup.py - -Modified: trunk/rpy/rpy_tools.py -=================================================================== ---- trunk/rpy/rpy_tools.py 2008-05-14 17:51:40 UTC (rev 522) -+++ trunk/rpy/rpy_tools.py 2008-05-14 18:31:21 UTC (rev 523) -@@ -143,3 +143,20 @@ - % PYTHON_DIR ) - - return PYTHON_DIR -+ -+def get_R_LAPACK_LIB_FLAGS(RHOME=get_R_HOME()): -+ """ -+ Determine the necessary link arguments for lapack -+ """ -+ rexec = os.path.join(RHOME, 'bin', 'R') -+ stat, output = getstatusoutput('"%s" CMD config LAPACK_LIBS' % rexec ) -+ if stat or len(output)<=0: -+ raise RuntimeError("Couldn't execute the R interpreter" + -+ " `%s'.\n" % rexec ) -+ -+ LAPACK_LIB_FLAGS = output.strip() -+ if not LAPACK_LIB_FLAGS: -+ raise RuntimeError("Couldn't obtain LAPACK_LIBS information from output\n" -+ "of `R CMD config LAPACK_LIBS'.\n") -+ -+ return LAPACK_LIB_FLAGS - -Modified: trunk/rpy/setup.py -=================================================================== ---- trunk/rpy/setup.py 2008-05-14 17:51:40 UTC (rev 522) -+++ trunk/rpy/setup.py 2008-05-14 18:31:21 UTC (rev 523) -@@ -150,23 +150,20 @@ - library_dirs= r_libs - runtime_libs = r_libs - extra_compile_args=[] -- elif sys.platform=='osf1V5': -- include_dirs = [ os.path.join(RHOME.strip(), 'include'), -- 'src' ] -- libraries=['R','Rlapack'] -- library_dirs = r_libs -- runtime_libs = r_libs -- extra_compile_args=["-shared"] -- source_files = source_files + ["src/setenv.c"] -+ - else: # unix-like systems, this is known to work for Linux and Solaris - include_dirs = [ os.path.join(RHOME.strip(), 'include'), - 'src', '/usr/share/R/include', "/usr/include/R"] -- libraries=['R','Rlapack'] - library_dirs = r_libs - runtime_libs = r_libs - extra_compile_args=["-shared"] - source_files = source_files + ["src/setenv.c"] - -+ libraries=['R'] -+ -+ # Ask R to tell us how to properly link against lapack -+ extra_compile_args += [ rpy_tools.get_R_LAPACK_LIB_FLAGS( RHOME ) ] -+ - # Discover which array packages are present - try: - import numpy diff --git a/rpy.spec b/rpy.spec index fb70395..5d6eb37 100644 --- a/rpy.spec +++ b/rpy.spec @@ -4,7 +4,7 @@ Name: rpy Summary: Python interface to the R language Version: 2.0.8 -Release: 1%{?dist} +Release: 2%{?dist} Url: http://rpy.sourceforge.net Source: http://downloads.sf.net/%{name}/%{name}2-%{version}.tar.gz License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -50,6 +50,9 @@ rm -rf $RPM_BUILD_ROOT %{python_sitearch}/rpy2-%{version}*.egg-info %changelog +* Thu Apr 8 2010 José Matos - 2.0.8-2 +- Rebuild for new numpy. + * Mon Jan 25 2010 Tom "spot" Callaway - 2.0.8-1 - update to 2.0.8