rpms/R
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

make cups a Recommends, update syslapack conditional to include f31

Browse Source
This commit is contained in:
Tom Callaway 2020-09-08 12:30:48 -04:00
parent 9344422d47
commit ba64e1993e
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
R.spec
View File

@ -4,11 +4,11 @@
%global runjavareconf 1 %global runjavareconf 1
# lapack comes from openblas, whenever possible. # 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 # This was to minimize the impact on end-users who might have R modules
# installed locally with the old dependency on libRlapack.so # installed locally with the old dependency on libRlapack.so
%if 0%{?fedora} >= 32 %if 0%{?fedora} >= 31
%global syslapack 1 %global syslapack 1
%else %else
%if 0%{?rhel} && 0%{?rhel} >= 8 %if 0%{?rhel} && 0%{?rhel} >= 8
@ -303,7 +303,9 @@ and called at run time.
%package core %package core
Summary: The minimal R components necessary for a functional runtime Summary: The minimal R components necessary for a functional runtime
Requires: xdg-utils, cups Requires: xdg-utils
# Bugzilla 1875165
Recommends: cups
# R inherits the compiler flags it was built with, hence we need this on hardened systems # R inherits the compiler flags it was built with, hence we need this on hardened systems
%if 0%{hardening} %if 0%{hardening}
Requires: redhat-rpm-config Requires: redhat-rpm-config
@ -1278,6 +1280,10 @@ R CMD javareconf \
%{_libdir}/libRmath.a %{_libdir}/libRmath.a
%changelog %changelog
* Tue Sep 8 2020 Tom Callaway <spot@fedoraproject.org> - 4.0.2-5
- make cups a "Recommends" instead of a "Requires" (bz1875165)
- even though f31 uses a forked spec file, reflect the systemlapack change there here
* Fri Aug 07 2020 Iñaki Úcar <iucar@fedoraproject.org> - 4.0.2-4 * Fri Aug 07 2020 Iñaki Úcar <iucar@fedoraproject.org> - 4.0.2-4
- https://fedoraproject.org/wiki/Changes/FlexiBLAS_as_BLAS/LAPACK_manager - https://fedoraproject.org/wiki/Changes/FlexiBLAS_as_BLAS/LAPACK_manager