rpms/R/FC-4 R.spec,1.17,1.18

[Tom Callaway (spot)]

Author: spot

Update of /cvs/extras/rpms/R/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15862/FC-4

Modified Files:
	R.spec 
Log Message:

Update to current patched level to fix buffer overflow condition.



Index: R.spec
===================================================================
RCS file: /cvs/extras/rpms/R/FC-4/R.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- R.spec	16 Oct 2006 21:09:25 -0000	1.17
+++ R.spec	4 Nov 2006 06:16:09 -0000	1.18
@@ -1,6 +1,6 @@
 Name: R
 Version: 2.4.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
@@ -16,6 +16,9 @@
 BuildRequires: java-1.4.2-gcj-compat, lapack-devel
 Requires: evince, cups, firefox
 
+# This syncs us with the "patched" development tree.
+Patch0: R-2.4.0-patched-2006-11-03.patch
+
 # These are the submodules that R provides. Sometimes R modules say they
 # depend on one of these submodules rather than just R. These are 
 # provided for packager convenience. 
@@ -96,6 +99,7 @@
 
 %prep
 %setup -q 
+%patch0 -p1
 
 %build
 export R_PDFVIEWER="%{_bindir}/evince"
@@ -115,7 +119,7 @@
     --with-tcl-config=%{_libdir}/tclConfig.sh \
     --with-tk-config=%{_libdir}/tkConfig.sh \
     --enable-R-shlib )\
- | egrep '^R is now|^ |^$' - > CAPABILITIES
+ | grep -A30 'R is now' - > CAPABILITIES
 make 
 (cd src/nmath/standalone; make)
 #make check-all
@@ -226,6 +230,9 @@
 /sbin/ldconfig
 
 %changelog
+* Fri Nov  3 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.4.0-2
+- sync with patched 2006-11-03 level to fix PR#9339
+
 * Sun Oct 15 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.4.0-1
 - bump for 2.4.0