Enable libcurl > 7
This commit is contained in:
parent
87137bd1d2
commit
d95b03bde3
39
R-4.2.3-curl-v8.patch
Normal file
39
R-4.2.3-curl-v8.patch
Normal file
@ -0,0 +1,39 @@
|
||||
From 37765d46ef9ebfc0ce07a9a6d125649c07196d8b Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?I=C3=B1aki=20=C3=9Acar?= <iucar@fedoraproject.org>
|
||||
Date: Thu, 23 Mar 2023 10:13:27 +0100
|
||||
Subject: [PATCH] curl v8
|
||||
|
||||
---
|
||||
configure | 2 +-
|
||||
m4/R.m4 | 2 +-
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/configure b/configure
|
||||
index f30284e..fbd8168 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -47606,7 +47606,7 @@ int main(int argc, const char * argv[])
|
||||
{
|
||||
#ifdef LIBCURL_VERSION_MAJOR
|
||||
#if LIBCURL_VERSION_MAJOR > 7
|
||||
- exit(1);
|
||||
+ exit(0);
|
||||
#elif LIBCURL_VERSION_MAJOR == 7 && LIBCURL_VERSION_MINOR >= 28
|
||||
exit(0);
|
||||
#else
|
||||
diff --git a/m4/R.m4 b/m4/R.m4
|
||||
index 55ace6a..9d37330 100644
|
||||
--- a/m4/R.m4
|
||||
+++ b/m4/R.m4
|
||||
@@ -4308,7 +4308,7 @@ int main(int argc, const char * argv[])
|
||||
{
|
||||
#ifdef LIBCURL_VERSION_MAJOR
|
||||
#if LIBCURL_VERSION_MAJOR > 7
|
||||
- exit(1);
|
||||
+ exit(0);
|
||||
#elif LIBCURL_VERSION_MAJOR == 7 && LIBCURL_VERSION_MINOR >= 28
|
||||
exit(0);
|
||||
#else
|
||||
--
|
||||
2.39.2
|
||||
|
7
R.spec
7
R.spec
@ -41,7 +41,7 @@
|
||||
|
||||
Name: R
|
||||
Version: %{major_version}.%{minor_version}.%{patch_version}
|
||||
Release: 1%{?dist}
|
||||
Release: 2%{?dist}
|
||||
Summary: A language for data analysis and graphics
|
||||
|
||||
License: GPL-2.0-or-later
|
||||
@ -49,6 +49,7 @@ URL: https://www.r-project.org
|
||||
Source0: https://cran.r-project.org/src/base/R-4/R-%{version}.tar.gz
|
||||
# see https://bugzilla.redhat.com/show_bug.cgi?id=1324145
|
||||
Patch0: R-3.3.0-fix-java_path-in-javareconf.patch
|
||||
Patch1: R-4.2.3-curl-v8.patch
|
||||
|
||||
BuildRequires: gcc-gfortran
|
||||
BuildRequires: gcc-c++
|
||||
@ -324,6 +325,7 @@ from the R project. This package provides the static libRmath library.
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1 -b .fixpath
|
||||
%patch1 -p1 -b .fixpath
|
||||
|
||||
# Filter false positive provides.
|
||||
cat <<EOF > %{name}-prov
|
||||
@ -828,6 +830,9 @@ fi
|
||||
%{_libdir}/libRmath.a
|
||||
|
||||
%changelog
|
||||
* Thu Mar 23 2023 Iñaki Úcar <iucar@fedoraproject.org> - 4.2.3-2
|
||||
- Enable libcurl > 7
|
||||
|
||||
* Wed Mar 15 2023 Iñaki Úcar <iucar@fedoraproject.org> - 4.2.3-1
|
||||
- Update to 4.2.3
|
||||
- Adapt license tag to SPDX
|
||||
|
Loading…
Reference in New Issue
Block a user