Compare commits
3 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
3d7139e961 | ||
|
|
5f42075c5f | ||
|
|
41b8088bd7 |
2 changed files with 36 additions and 3 deletions
12
R-3.6.3-fix-symbol-font.patch
Normal file
12
R-3.6.3-fix-symbol-font.patch
Normal file
|
|
@ -0,0 +1,12 @@
|
|||
diff -up R-3.6.3/src/library/grDevices/src/cairo/cairoFns.c.symbol R-3.6.3/src/library/grDevices/src/cairo/cairoFns.c
|
||||
--- R-3.6.3/src/library/grDevices/src/cairo/cairoFns.c.symbol 2020-05-01 12:16:01.605789337 +0200
|
||||
+++ R-3.6.3/src/library/grDevices/src/cairo/cairoFns.c 2020-05-01 12:16:11.757724467 +0200
|
||||
@@ -464,7 +464,7 @@ static PangoFontDescription
|
||||
|
||||
fontdesc = pango_font_description_new();
|
||||
if (face == 5)
|
||||
- pango_font_description_set_family(fontdesc, "symbol");
|
||||
+ pango_font_description_set_family(fontdesc, "OpenSymbol");
|
||||
else {
|
||||
const char *fm = gc->fontfamily;
|
||||
if (!fm[0]) fm = family;
|
||||
27
R.spec
27
R.spec
|
|
@ -4,10 +4,10 @@
|
|||
%global runjavareconf 1
|
||||
|
||||
# lapack comes from openblas, whenever possible.
|
||||
# We decided to implement this change in Fedora 32+ and EPEL-8 only.
|
||||
# We decided to implement this change in Fedora 31+ and EPEL-8 only.
|
||||
# This was to minimize the impact on end-users who might have R modules
|
||||
# installed locally with the old dependency on libRlapack.so
|
||||
%if 0%{?fedora} >= 32
|
||||
%if 0%{?fedora} >= 31
|
||||
%global syslapack 1
|
||||
%else
|
||||
%if 0%{?rhel} && 0%{?rhel} >= 8
|
||||
|
|
@ -37,11 +37,13 @@
|
|||
|
||||
%if 0%{?fedora} >= 31
|
||||
%global usemacros 1
|
||||
%global symbolsfont 1
|
||||
%else
|
||||
%if 0%{?rhel} && 0%{?rhel} >= 8
|
||||
%global usemacros 1
|
||||
%else
|
||||
%global usemacros 0
|
||||
%global symbolsfont 0
|
||||
%endif
|
||||
%endif
|
||||
|
||||
|
|
@ -148,7 +150,7 @@
|
|||
|
||||
Name: R
|
||||
Version: 3.6.3
|
||||
Release: 1%{?dist}
|
||||
Release: 3%{?dist}
|
||||
Summary: A language for data analysis and graphics
|
||||
URL: http://www.r-project.org
|
||||
Source0: https://cran.r-project.org/src/base/R-3/R-%{version}.tar.gz
|
||||
|
|
@ -258,6 +260,12 @@ BuildRequires: tex(upquote.sty)
|
|||
BuildRequires: devtoolset-%{dts_version}-toolchain
|
||||
%endif
|
||||
|
||||
# see https://bugzilla.redhat.com/show_bug.cgi?id=1815128
|
||||
Patch2: R-3.6.3-fix-symbol-font.patch
|
||||
%if %{symbolsfont}
|
||||
BuildRequires: libreoffice-opensymbol-fonts
|
||||
%endif
|
||||
|
||||
# R-devel will pull in R-core
|
||||
Requires: R-devel = %{version}-%{release}
|
||||
# libRmath-devel will pull in libRmath
|
||||
|
|
@ -316,6 +324,10 @@ Requires: openblas-Rblas
|
|||
Requires: devtoolset-%{dts_version}-toolchain
|
||||
%endif
|
||||
|
||||
%if %{symbolsfont}
|
||||
Requires: libreoffice-opensymbol-fonts
|
||||
%endif
|
||||
|
||||
# These are the submodules that R-core provides. Sometimes R modules say they
|
||||
# depend on one of these submodules rather than just R. These are provided for
|
||||
# packager convenience.
|
||||
|
|
@ -509,6 +521,9 @@ from the R project. This package provides the static libRmath library.
|
|||
%setup -q -n %{name}-%{version}
|
||||
%endif
|
||||
%patch1 -p1 -b .fixpath
|
||||
%if %{symbolsfont}
|
||||
%patch2 -p1 -b .symbol
|
||||
%endif
|
||||
|
||||
# Filter false positive provides.
|
||||
cat <<EOF > %{name}-prov
|
||||
|
|
@ -1234,6 +1249,12 @@ R CMD javareconf \
|
|||
%{_libdir}/libRmath.a
|
||||
|
||||
%changelog
|
||||
* Mon Aug 31 2020 Tom Callaway <spot@fedoraproject.org> - 3.6.3-3
|
||||
- rebuild with syslapack on
|
||||
|
||||
* Fri May 1 2020 Iñaki Úcar <iucar@fedoraproject.org> - 3.6.3-2
|
||||
- fix symbol font display with pango >= 1.44
|
||||
|
||||
* Mon Mar 2 2020 Tom Callaway <spot@fedoraproject.org> - 3.6.3-1
|
||||
- update to 3.6.3
|
||||
- conditionalize lapack changes from previous commits to Fedora 32+ and EPEL-8
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue