rpms/R/devel R-2.7.2-filter_asoption.patch, NONE, 1.1 R.spec, 1.47, 1.48

[Tom Callaway]

Author: spot

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

Modified Files:
	R.spec 
Added Files:
	R-2.7.2-filter_asoption.patch 
Log Message:
fix sh compile, bz 464055

R-2.7.2-filter_asoption.patch:

--- NEW FILE R-2.7.2-filter_asoption.patch ---
--- R-2.7.2/configure.org	2008-09-25 15:00:20.000000000 +0900
+++ R-2.7.2/configure	2008-09-25 15:00:35.000000000 +0900
@@ -26995,7 +26995,7 @@
 
           ;;
           # Ignore these flags.
-        -lang* | -lcrt*.o | -lc | -lgcc* | -lSystem | -libmil | -LANG:=* | -LIST:* | -LNO:*)
+        -little | -lang* | -lcrt*.o | -lc | -lgcc* | -lSystem | -libmil | -LANG:=* | -LIST:* | -LNO:*)
           ;;
         -lkernel32)
           test x"$CYGWIN" != xyes && ac_cv_f77_libs="$ac_cv_f77_libs $ac_arg"


Index: R.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R/devel/R.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- R.spec	29 Aug 2008 15:53:53 -0000	1.47
+++ R.spec	16 Oct 2008 20:45:20 -0000	1.48
@@ -1,6 +1,6 @@
 Name: R
 Version: 2.7.2
-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
@@ -9,6 +9,7 @@
 # Sent upstream:
 # http://bugs.r-project.org/cgi-bin/R/incoming?id=12636
 Patch0: R-2.7.1-javareconf-tmpfix.patch
+Patch1: R-2.7.2-filter_asoption.patch
 License: GPLv2+
 Group: Applications/Engineering
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -103,6 +104,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .javareconf-tmpfix
+%patch1 -p1 -b .filter-little-out
 
 # Filter false positive provides.
 cat <<EOF > %{name}-prov
@@ -137,7 +139,7 @@
           export F77="gfortran -m64"
           export FC="gfortran -m64"
       ;;
-      ia64|alpha)
+      ia64|alpha|sh*)
           export CC="gcc"
           export CXX="g++"
           export F77="gfortran"
@@ -287,6 +289,9 @@
 /sbin/ldconfig
 
 %changelog
+* Thu Oct 16 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.7.2-2
+- fix sh compile (bz 464055)
+
 * Fri Aug 29 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.7.2-1
 - update to 2.7.2
 - fix spec for alpha compile (bz 458931)