| |
@@ -186,7 +186,7 @@
|
| |
|
| |
Name: R
|
| |
Version: %{major_version}.%{minor_version}.%{patch_version}
|
| |
- Release: 4%{?dist}
|
| |
+ Release: 5%{?dist}
|
| |
Summary: A language for data analysis and graphics
|
| |
URL: http://www.r-project.org
|
| |
Source0: https://cran.r-project.org/src/base/R-4/R-%{version}.tar.gz
|
| |
@@ -673,22 +673,10 @@
|
| |
export LDFLAGS="-ldl -lpthread -lc -lrt -Wl,--as-needed -Wl,--whole-archive %{_builddir}/%{name}-%{version}/zlib-%{zlibv}/target%{_libdir}/libz.a %{_builddir}/%{name}-%{version}/bzip2-%{bzipv}/target%{_libdir}/libbz2.a %{_builddir}/%{name}-%{version}/xz-%{xzv}/target%{_libdir}/liblzma.a %{_builddir}/%{name}-%{version}/pcre-%{pcrev}/target%{_libdir}/libpcre.a %{_builddir}/%{name}-%{version}/curl-%{curlv}/target%{_libdir}/libcurl.a -Wl,--no-whole-archive -L%{_builddir}/%{name}-%{version}/curl-%{curlv}/target%{_libdir}/ $CURL_LIBS"
|
| |
%endif
|
| |
|
| |
- %if 0%{?fedora} >= 21
|
| |
- %if %{with_lto}
|
| |
- # With gcc 4.9, if we don't pass -ffat-lto-objects along with -flto, Matrix builds without the needed object code
|
| |
- # ... and doesn't work at all as a result.
|
| |
- export CFLAGS="%{optflags} -ffat-lto-objects"
|
| |
- export CXXFLAGS="%{optflags} -ffat-lto-objects"
|
| |
- export FCFLAGS="%{optflags} -ffat-lto-objects"
|
| |
- %endif
|
| |
- %else
|
| |
- export FCFLAGS="%{optflags}"
|
| |
- %endif
|
| |
-
|
| |
%if 0%{?fedora} >= 30
|
| |
# gcc9 needs us to pass --no-optimize-sibling-calls to gfortran
|
| |
- export FCFLAGS="%{optflags} --no-optimize-sibling-calls"
|
| |
- export FFLAGS="%{optflags} --no-optimize-sibling-calls"
|
| |
+ export FCFLAGS="%{build_fflags} --no-optimize-sibling-calls"
|
| |
+ export FFLAGS="%{build_fflags} --no-optimize-sibling-calls"
|
| |
%endif
|
| |
|
| |
# RHEL 5 & 6 & 7 have a broken BLAS, so we need to use the bundled bits in R until
|
| |
@@ -1287,6 +1275,9 @@
|
| |
%{_libdir}/libRmath.a
|
| |
|
| |
%changelog
|
| |
+ * Thu Mar 17 2022 Tom Stellard <tstellar@redhat.com> - 4.1.2-5
|
| |
+ - Spec file cleanups
|
| |
+
|
| |
* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 4.1.2-4
|
| |
- Rebuilt for java-17-openjdk as system jdk
|
| |
|
| |
tstellar
commented 2 years ago
already the fedora default).