rpms/rpy/F-8 rpy-1.0.1-FHSinclude.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 rpy.spec, 1.24, 1.25 sources, 1.4, 1.5

[José Abílio Oliveira Matos (jamatos)]

Author: jamatos

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

Modified Files:
	.cvsignore rpy.spec sources 
Added Files:
	rpy-1.0.1-FHSinclude.patch 
Log Message:
* Mon Feb  4 2008 José Matos <jamatos[AT]fc.up.pt> - 1.0.1-2
- Sometimes _patch_'s guesses are not good enough. Redo patch to setup.py.


rpy-1.0.1-FHSinclude.patch:

--- NEW FILE rpy-1.0.1-FHSinclude.patch ---
--- 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


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rpy/F-8/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	29 Aug 2007 17:36:29 -0000	1.4
+++ .cvsignore	4 Feb 2008 15:41:57 -0000	1.5
@@ -1 +1 @@
-rpy-1.0-RC3.tar.gz
+rpy-1.0.1.tar.gz


Index: rpy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpy/F-8/rpy.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- rpy.spec	8 Jan 2008 00:26:21 -0000	1.24
+++ rpy.spec	4 Feb 2008 15:41:57 -0000	1.25
@@ -1,23 +1,21 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
-%define prev  RC3
-%define pred .%{prev}
-%define pre  -%{prev}
-
+%define rver   2.6.1
 Name:          rpy
 Summary:       Python interface to the R language
-Version:       1.0
-Release:       0.6%{?pred}%{?dist}
+Version:       1.0.1
+Release:       2%{?dist}
 Url:           http://rpy.sourceforge.net
-Source:        http://dl.sf.net/%{name}/%{name}-%{version}%{?pre}.tar.gz
+Source:        http://downloads.sf.net/%{name}/%{name}-%{version}.tar.gz
 License:       GPLv2+
 Group:         Development/Libraries
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch0:        rpy-1.0.1-FHSinclude.patch
 
-BuildRequires: R-devel = 2.6.1, numpy, python-devel, texinfo, tetex
+BuildRequires: R-devel = %{rver}, numpy, python-devel, texinfo, tetex
 
 Requires:      numpy
-Requires:      R = 2.6.1
+Requires:      R = %{rver}
 
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
@@ -28,8 +26,10 @@
 execute arbitrary R functions. All the errors from the R language are
 converted to Python exceptions.
 
-%prep 
-%setup -n %{name}-%{version}%{?pre}
+%prep
+%setup -q
+# The R headers are now in /usr/include/R (for F9+)
+%patch0
 
 %build
 env CFLAGS="$RPM_OPT_FLAGS" python setup.py build
@@ -68,6 +68,15 @@
 
 
 %changelog
+* Mon Feb  4 2008 José Matos <jamatos[AT]fc.up.pt> - 1.0.1-2
+- Sometimes _patch_'s guesses are not good enough. Redo patch to setup.py.
+
+* Sun Feb  3 2008 José Matos <jamatos[AT]fc.up.pt> - 1.0.1-1
+- New upstream release.
+
+* Mon Jan  7 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.0-0.7.RC3
+- find the moved R headers in their new home (/usr/include/R)
+
 * Mon Jan  7 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.0-0.6.RC3
 - BuildRequires: R-devel rather than just R
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rpy/F-8/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	29 Aug 2007 17:36:29 -0000	1.4
+++ sources	4 Feb 2008 15:41:57 -0000	1.5
@@ -1 +1 @@
-92bc13f5dfd31bd6ab92c834e845ed4c  rpy-1.0-RC3.tar.gz
+3897e05e67230717396859bcc00a8768  rpy-1.0.1.tar.gz