rpms/rpy/devel rpy-rversion.patch,NONE,1.1 rpy.spec,1.8,1.9

José Abílio Oliveira Matos (jamatos) fedora-extras-commits at redhat.com
Wed Apr 26 11:47:36 UTC 2006


Author: jamatos

Update of /cvs/extras/rpms/rpy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30248

Modified Files:
	rpy.spec 
Added Files:
	rpy-rversion.patch 
Log Message:
* Wed Apr 26 2006 José Matos <jamatos at fc.up.pt> - 0.4.6-9
- Fix detection of R version.


rpy-rversion.patch:

--- NEW FILE rpy-rversion.patch ---
diff -ur rpy-0.4.6/rpy_tools.py rpy-0.4.6-new/rpy_tools.py
--- rpy-0.4.6/rpy_tools.py	2005-07-28 05:47:47.000000000 +0100
+++ rpy-0.4.6-new/rpy_tools.py	2006-04-26 12:37:16.000000000 +0100
@@ -93,7 +93,7 @@
     if stat or len(output)<=0:
       raise RuntimeError("Couldn't execute the R interpreter" +
                          " `%s'.\n" % rexec )
-    version = re.search("R +([0-9]\.[0-9]\.[0-9])", output)
+    version = re.search("R version +([0-9]\.[0-9]\.[0-9])", output)
     if not version:
       raise RuntimeError("Couldn't obtain version number from output\n"
                                "of `R --version'.\n")


Index: rpy.spec
===================================================================
RCS file: /cvs/extras/rpms/rpy/devel/rpy.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- rpy.spec	26 Apr 2006 10:55:02 -0000	1.8
+++ rpy.spec	26 Apr 2006 11:47:36 -0000	1.9
@@ -3,10 +3,11 @@
 Name: 		rpy
 Summary: 	Python interface to the R language
 Version:	0.4.6
-Release:	8%{?dist}
+Release:	9%{?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
 License:	GPL
 Group:		Development/Libraries
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -27,7 +28,7 @@
 %prep
 %setup
 %patch1 -p1 -b .install-info
-
+%patch2 -p1
 
 %build
 env CFLAGS="$RPM_OPT_FLAGS" python setup.py build
@@ -66,6 +67,9 @@
 
 
 %changelog
+* Wed Apr 26 2006 José Matos <jamatos at fc.up.pt> - 0.4.6-9
+- Fix detection of R version.
+
 * Wed Apr 26 2006 José Matos <jamatos at fc.up.pt> - 0.4.6-8
 - Rebuild for R-2.3.0
 




More information about the scm-commits mailing list