rpms/rpy/devel rpy.spec,1.41,1.42

Tom Callaway spot at fedoraproject.org
Fri Jul 10 15:38:23 UTC 2009


Author: spot

Update of /cvs/pkgs/rpms/rpy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30869

Modified Files:
	rpy.spec 
Log Message:
fix broken build


Index: rpy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpy/devel/rpy.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- rpy.spec	9 Jul 2009 21:26:45 -0000	1.41
+++ rpy.spec	10 Jul 2009 15:37:52 -0000	1.42
@@ -4,7 +4,7 @@
 Name:          rpy
 Summary:       Python interface to the R language
 Version:       2.0.6
-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+
@@ -34,7 +34,11 @@ env CFLAGS="$RPM_OPT_FLAGS" python setup
 %install
 rm -rf $RPM_BUILD_ROOT
 python setup.py install -O1 --skip-build --root=$RPM_BUILD_ROOT
+%if 0%{?__isa_bits} = 64
+%ifnarch ia64
 mv %{buildroot}/usr/lib/python2.6/site-packages/rpy2/images %{buildroot}%{python_sitearch}/rpy2/
+%endif
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -46,6 +50,9 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/rpy2-%{version}*.egg-info
 
 %changelog
+* Fri Jul 10 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.0.6-2
+- images are only installed incorrectly on 64bit platforms that aren't ia64
+
 * Thu Jul  9 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.0.6-1
 - rebuild for R 2.9.1
 - update to rpy2 2.0.6




More information about the fedora-extras-commits mailing list