rpms/rpy/F-7 rpy-0.4.6-FHSinclude.patch, NONE, 1.1 rpy.spec, 1.25, 1.26

[Tom Callaway (spot)]

Author: spot

Update of /cvs/pkgs/rpms/rpy/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2040/F-7

Modified Files:
	rpy.spec 
Added Files:
	rpy-0.4.6-FHSinclude.patch 
Log Message:

updates for R 2.6.2 rebuild


rpy-0.4.6-FHSinclude.patch:

--- NEW FILE rpy-0.4.6-FHSinclude.patch ---
diff -up rpy-0.4.6/setup.py.BAD rpy-0.4.6/setup.py
--- rpy-0.4.6/setup.py.BAD	2008-03-12 17:13:08.000000000 -0400
+++ rpy-0.4.6/setup.py	2008-03-12 17:13:35.000000000 -0400
@@ -123,7 +123,7 @@ for RHOME in RHOMES:
         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' ]
+                         'src', '/usr/share/R/include', "/usr/include/R/" ]
         libraries=['R','Rlapack']
         library_dirs = r_libs
         runtime_libs = r_libs


Index: rpy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpy/F-7/rpy.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- rpy.spec	8 Jan 2008 00:26:31 -0000	1.25
+++ rpy.spec	12 Mar 2008 21:17:16 -0000	1.26
@@ -3,19 +3,20 @@
 Name: rpy
 Summary: Python interface to the R language
 Version: 0.4.6
-Release: 23%{?dist}
+Release: 24%{?dist}
 Url: http://rpy.sourceforge.net
 Source0: http://dl.sf.net/%{name}/%{name}-%{version}.tar.gz
 Patch1: rpy-install-info.patch
 Patch2: rpy-rversion.patch
+Patch3: rpy-0.4.6-FHSinclude.patch
 License: GPLv2+
 Group: Development/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: R-devel = 2.6.1, python-numeric, python-devel, texinfo, tetex
+BuildRequires: R-devel = 2.6.2, python-numeric, python-devel, texinfo, tetex
 
 Requires: python-numeric
-Requires: R = 2.6.1
+Requires: R = 2.6.2
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 
@@ -29,6 +30,7 @@
 %setup
 %patch1 -p1 -b .install-info
 %patch2 -p1
+%patch3 -p1
 
 %build
 env CFLAGS="$RPM_OPT_FLAGS" python setup.py build
@@ -67,6 +69,9 @@
 
 
 %changelog
+* Wed Mar 12 2008 Tom "spot" Callaway <tcallawa at redhat.com> 0.4.6-24
+- rebuild against R 2.6.2 (new includes path)
+
 * Mon Jan  7 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 0.4.6-23
 - BuildRequires: R-devel rather than just R