rpms/R/devel R-2.7.0-bad-path.patch,NONE,1.1 R.spec,1.41,1.42

[Tom Callaway (spot)]

Author: spot

Update of /cvs/pkgs/rpms/R/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4664/devel

Modified Files:
	R.spec 
Added Files:
	R-2.7.0-bad-path.patch 
Log Message:
R 2.7.0 everywhere

R-2.7.0-bad-path.patch:

--- NEW FILE R-2.7.0-bad-path.patch ---
Index: src/unix/Makefile.in
===================================================================
--- src/unix/Makefile.in	(revision 45534)
+++ src/unix/Makefile.in	(revision 45535)
@@ -78,11 +78,11 @@
 	  -e 's/@VERSION/$(VERSION)/' $(srcdir)/libR.pc.in \
 	  > "$(DESTDIR)$(libdir)/pkgconfig/libR.pc"
 
-install: install-main install-Rscript
+install: install-main
 install: @WANT_R_SHLIB_TRUE@ install-pc
 install: @WANT_R_STATIC_TRUE@ install-pc
 
-install-main:
+install-main: install-Rscript
 	@$(MKINSTALLDIRS) "$(DESTDIR)$(bindir)"
 	@$(INSTALL_PROGRAM) Rscript "$(DESTDIR)$(bindir)/Rscript"
 


Index: R.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R/devel/R.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- R.spec	29 Apr 2008 20:09:52 -0000	1.41
+++ R.spec	13 May 2008 16:55:43 -0000	1.42
@@ -1,11 +1,12 @@
 Name: R
 Version: 2.7.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: A language for data analysis and graphics
 URL: http://www.r-project.org
 Source0: ftp://cran.r-project.org/pub/R/src/base/R-2/R-%{version}.tar.gz
 Source1: macros.R
 Source2: R-make-search-index.sh
+Patch0: R-2.7.0-bad-path.patch
 License: GPLv2+
 Group: Applications/Engineering
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -99,6 +100,7 @@
 
 %prep
 %setup -q
+%patch0 -p0
 
 # Filter false positive provides.
 cat <<EOF > %{name}-prov
@@ -133,6 +135,12 @@
           export F77="gfortran -m64"
           export FC="gfortran -m64"
       ;;
+      ia64)
+          export CC="gcc"
+          export CXX="g++"
+          export F77="gfortran"
+          export FC="gfortran"
+      ;;
       *)
           export CC="gcc -m32"
           export CXX="g++ -m32"
@@ -269,6 +277,11 @@
 /sbin/ldconfig
 
 %changelog
+* Tue May 13 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.7.0-2
+- add patch from Martyn Plummer to avoid possible bad path hardcoding in 
+  /usr/bin/Rscript
+- properly handle ia64 case (bz 446181)
+
 * Mon Apr 28 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.7.0-1
 - update to 2.70
 - rcompgen is no longer a standalone package