rpms/R/F-9 R-2.7.0-bad-path.patch, NONE, 1.1 R-make-search-index.sh, 1.2, 1.3 R.spec, 1.40, 1.41
Tom Callaway (spot)
fedora-extras-commits at redhat.com
Tue May 13 16:56:13 UTC 2008
- Previous message: rpms/R/F-7 R-2.7.0-bad-path.patch, NONE, 1.1 R-make-search-index.sh, 1.2, 1.3 R.spec, 1.39, 1.40
- Next message: rpms/R/devel R-2.7.0-bad-path.patch,NONE,1.1 R.spec,1.41,1.42
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: spot
Update of /cvs/pkgs/rpms/R/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4664/F-9
Modified Files:
R-make-search-index.sh 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-make-search-index.sh
===================================================================
RCS file: /cvs/pkgs/rpms/R/F-9/R-make-search-index.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- R-make-search-index.sh 8 Feb 2008 19:27:58 -0000 1.2
+++ R-make-search-index.sh 13 May 2008 16:55:29 -0000 1.3
@@ -7,9 +7,15 @@
# Ideally, we could ask R just like we do for RHOME, but we can't yet.
TMP_R_DOC_DIR=`grep "R_DOC_DIR=" /usr/bin/R | cut -d "=" -f 2`
-# Write out all the contents in arch and noarch library locations
+# Write out all the contents in arch library locations
cat $TMP_R_HOME/library/*/CONTENTS > $TMP_R_DOC_DIR/html/search/index.txt 2>/dev/null
+# Don't use .. based paths, substitute TMP_R_HOME
+sed -i "s!../../..!$TMP_R_HOME!g" $TMP_R_DOC_DIR/html/search/index.txt
+
+# Write out all the contents in noarch library locations
cat /usr/share/R/library/*/CONTENTS >> $TMP_R_DOC_DIR/html/search/index.txt 2>/dev/null
+# Don't use .. based paths, substitute /usr/share/R
+sed -i "s!../../..!/usr/share/R!g" $TMP_R_DOC_DIR/html/search/index.txt
exit 0
Index: R.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R/F-9/R.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- R.spec 8 Feb 2008 19:27:58 -0000 1.40
+++ R.spec 13 May 2008 16:55:29 -0000 1.41
@@ -1,11 +1,12 @@
Name: R
-Version: 2.6.2
-Release: 1%{?dist}
+Version: 2.7.0
+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)
@@ -26,8 +27,8 @@
Provides: R-base = %{version}
Provides: R-boot = 1.2
Provides: R-class = 7.2
-Provides: R-cluster = 1.11.9
-Provides: R-codetools = 0.1
+Provides: R-cluster = 1.11.10
+Provides: R-codetools = 0.2
Provides: R-datasets = %{version}
Provides: R-foreign = 0.8
Provides: R-graphics = %{version}
@@ -40,7 +41,6 @@
Provides: R-mgcv = 1.3
Provides: R-nlme = 3.1
Provides: R-nnet = 7.2
-Provides: R-rcompgen = 0.1
Provides: R-rpart = 3.1
Provides: R-spatial = 7.2
Provides: R-splines = %{version}
@@ -52,9 +52,6 @@
Provides: R-utils = %{version}
Provides: R-VR = 7.2
-# Temporary fix to avoid the SNAFU of the 0.fdr.2.* release
-Conflicts: R-devel < %{version}-%{release}
-
%description
A language and environment for statistical computing and graphics.
R is similar to the award-winning S system, which was developed at
@@ -103,6 +100,7 @@
%prep
%setup -q
+%patch0 -p0
# Filter false positive provides.
cat <<EOF > %{name}-prov
@@ -137,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"
@@ -239,13 +243,18 @@
fi
done
/sbin/ldconfig
-R CMD javareconf || exit 0
+R CMD javareconf > /dev/null 2>&1 || exit 0
# Update package indices
%__cat %{_libdir}/R/library/*/CONTENTS > %{_docdir}/R-%{version}/html/search/index.txt 2>/dev/null
+# Don't use .. based paths, substitute RHOME
+sed -i "s!../../..!%{_libdir}/R!g" %{_docdir}/R-%{version}/html/search/index.txt
# This could fail if there are no noarch R libraries on the system.
%__cat %{_datadir}/R/library/*/CONTENTS >> %{_docdir}/R-%{version}/html/search/index.txt 2>/dev/null || exit 0
+# Don't use .. based paths, substitute /usr/share/R
+sed -i "s!../../..!/usr/share/R!g" %{_docdir}/R-%{version}/html/search/index.txt
+
%preun
if [ $1 = 0 ]; then
@@ -268,6 +277,16 @@
/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
+- redirect javareconf to /dev/null (bz 442366)
+
* Fri Feb 8 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.6.2-1
- properly version the items in the VR bundle
- 2.6.2
- Previous message: rpms/R/F-7 R-2.7.0-bad-path.patch, NONE, 1.1 R-make-search-index.sh, 1.2, 1.3 R.spec, 1.39, 1.40
- Next message: rpms/R/devel R-2.7.0-bad-path.patch,NONE,1.1 R.spec,1.41,1.42
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list