rpms/rpy/F-9 rpy-1.0.3-R-2.8.0.patch,NONE,1.1 rpy.spec,1.34,1.35

[Tom Callaway]

Author: spot

Update of /cvs/pkgs/rpms/rpy/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32150/F-9

Modified Files:
	rpy.spec 
Added Files:
	rpy-1.0.3-R-2.8.0.patch 
Log Message:
R 2.8.0

rpy-1.0.3-R-2.8.0.patch:

--- NEW FILE rpy-1.0.3-R-2.8.0.patch ---
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 <Rdevices.h> /* must follow Graphics.h */
-
+#endif
 
 /* Missing definitions from Rinterface.h or RStartup.h */
 # define CleanEd		Rf_CleanEd


Index: rpy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpy/F-9/rpy.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- rpy.spec	29 Aug 2008 18:44:28 -0000	1.34
+++ rpy.spec	27 Oct 2008 11:37:00 -0000	1.35
@@ -1,10 +1,10 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
-%define rver   2.7.2
+%define rver   2.8.0
 Name:          rpy
 Summary:       Python interface to the R language
 Version:       1.0.3
-Release:       3%{?dist}
+Release:       4%{?dist}
 Url:           http://rpy.sourceforge.net
 Source:        http://downloads.sf.net/%{name}/%{name}-%{version}.tar.gz
 License:       GPLv2+
@@ -16,6 +16,8 @@
 # Backported patches from development
 Patch1:	       rpy-1.0.3-turn-off-debug.patch
 Patch2:	       rpy-1.0.3-use-lapack.patch
+# Rdevices.h is gone in 2.8.0
+Patch3:        rpy-1.0.3-R-2.8.0.patch
 
 BuildRequires: R-devel = %{rver}, numpy, python-devel, texinfo-tex, tetex
 
@@ -36,6 +38,7 @@
 %patch0
 %patch1 -p2
 %patch2 -p2
+%patch3 -p1
 
 %build
 env CFLAGS="$RPM_OPT_FLAGS" python setup.py build
@@ -74,6 +77,9 @@
 
 
 %changelog
+* Sun Oct 26 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.0.3-4
+- rebuild against R-2.8.0
+
 * Fri Aug 29 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.0.3-3
 - rebuild against R-2.7.2