[R/el4] do not try to use inconsolata on el
Tom Callaway
spot at fedoraproject.org
Tue Nov 8 13:39:47 UTC 2011
commit b5cfc3c934c6aff6fc2e05a8996bf308901a0cec
Author: Tom "spot" Callaway <tcallawa at redhat.com>
Date: Tue Nov 8 08:39:43 2011 -0500
do not try to use inconsolata on el
R.spec | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
---
diff --git a/R.spec b/R.spec
index cf5ed79..6f5d686 100644
--- a/R.spec
+++ b/R.spec
@@ -6,7 +6,7 @@
Name: R
Version: 2.14.0
-Release: 2%{?dist}
+Release: 3%{?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
@@ -169,6 +169,11 @@ echo 'R_LIBS_SITE=${R_LIBS_SITE-'"'/usr/local/lib/R/site-library:/usr/local/lib/
export R_PDFVIEWER="%{_bindir}/ggv"
export R_PRINTCMD="lpr"
export R_BROWSER="%{_bindir}/firefox"
+# No inconsolata on RHEL tex
+%if 0%{?rhel}
+export R_RD4PDF="times,hyper"
+sed -i 's|inconsolata,||g' etc/Renviron.in
+%endif
# Only broken on EL-4, ppc
%ifarch ppc
export CPICFLAGS="-fPIC"
@@ -925,6 +930,9 @@ fi
%postun -n libRmath -p /sbin/ldconfig
%changelog
+* Tue Nov 8 2011 Tom Callaway <spot at fedoraproject.org> - 2.14.0-3
+- No inconsolata for EL
+
* Mon Nov 7 2011 Tom Callaway <spot at fedoraproject.org> - 2.14.0-2
- add texinfo to Requires for -devel package
More information about the scm-commits
mailing list