From 4ac1a69ba21e836cc4e9293b4bea530a5f669de0 Mon Sep 17 00:00:00 2001
From: Tom Callaway <spot@fedoraproject.org>
Date: Tue, 13 May 2008 16:55:43 +0000
Subject: [PATCH] R 2.7.0 everywhere

---
 R-2.7.0-bad-path.patch | 18 ++++++++++++++++++
 R.spec                 | 15 ++++++++++++++-
 2 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 R-2.7.0-bad-path.patch

diff --git a/R-2.7.0-bad-path.patch b/R-2.7.0-bad-path.patch
new file mode 100644
index 0000000..76bc91e
--- /dev/null
+++ b/R-2.7.0-bad-path.patch
@@ -0,0 +1,18 @@
+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"
+ 
diff --git a/R.spec b/R.spec
index 92a1ef4..1cc4491 100644
--- a/R.spec
+++ b/R.spec
@@ -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 @@ and header files.
 
 %prep
 %setup -q
+%patch0 -p0
 
 # Filter false positive provides.
 cat <<EOF > %{name}-prov
@@ -133,6 +135,12 @@ case "%{_target_cpu}" in
           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 @@ fi
 /sbin/ldconfig
 
 %changelog
+* Tue May 13 2008 Tom "spot" Callaway <tcallawa@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@redhat.com> 2.7.0-1
 - update to 2.70
 - rcompgen is no longer a standalone package