rpms/rpy/F-11 rpy.spec,1.43,1.44

[José Abílio Oliveira Matos]

Author: jamatos

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

Modified Files:
	rpy.spec 
Log Message:
Keep in sync with rawhide version.



Index: rpy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpy/F-11/rpy.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- rpy.spec	21 Sep 2009 09:47:43 -0000	1.43
+++ rpy.spec	21 Sep 2009 10:25:32 -0000	1.44
@@ -4,7 +4,7 @@
 Name:          rpy
 Summary:       Python interface to the R language
 Version:       2.0.6
-Release:       1%{?dist}
+Release:       6%{?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,6 +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
@@ -45,15 +50,21 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/rpy2-%{version}*.egg-info
 
 %changelog
-* Mon Sep 21 2009 José Matos <jamatos at fc.up.pt> - 2.0.6-1
-- update to rpy 2.0.6
+* Mon Sep 21 2009 José Matos <jamatos at fc.up.pt> - 2.0.6-6
 - require at runtime just R-core
 
-* Mon Aug 24 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.0.3-4
-- rebuild for R-2.9.2
+* Mon Aug 24 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.0.6-5
+- rebuild for R 2.9.2
 
-* Thu Jul  9 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.0.3-3
-- rebuild for R-2.9.1
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.6-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Fri Jul 10 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.0.6-3
+- 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
 
 * Fri Apr 17 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.0.3-2
 - rebuild for R 2.9.0