From 4571d17185ce8a5397aad2a44c4b532b872045d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A1bor=20Cs=C3=A1rdi?= Date: Sun, 3 Nov 2024 21:19:05 +0100 Subject: [PATCH 1/3] Add Fedora 41, remove Fedora 38 Fedora 38 was EOL on 2024-05-21. --- Makefile | 2 +- README.md | 5 ++++- ...ckerfile.fedora-38 => Dockerfile.fedora-41} | 8 ++++---- builder/docker-compose.yml | 18 +++++++++--------- .../{package.fedora-38 => package.fedora-41} | 1 + serverless-resources.yml | 12 ++++++------ serverless.yml | 6 +++--- test/docker-compose.yml | 16 ++++++++-------- 8 files changed, 36 insertions(+), 32 deletions(-) rename builder/{Dockerfile.fedora-38 => Dockerfile.fedora-41} (93%) rename builder/{package.fedora-38 => package.fedora-41} (98%) diff --git a/Makefile b/Makefile index b448042..d7573e6 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -PLATFORMS := ubuntu-2004 ubuntu-2204 ubuntu-2404 debian-10 debian-11 debian-12 centos-7 centos-8 rhel-9 opensuse-155 opensuse-156 fedora-38 fedora-39 fedora-40 +PLATFORMS := ubuntu-2004 ubuntu-2204 ubuntu-2404 debian-10 debian-11 debian-12 centos-7 centos-8 rhel-9 opensuse-155 opensuse-156 fedora-39 fedora-40 fedora-41 SLS_BINARY ?= ./node_modules/serverless/bin/serverless.js deps: diff --git a/README.md b/README.md index f39c101..251adba 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ R binaries are built for the following Linux operating systems: - openSUSE 15.5 - openSUSE 15.6 - SUSE Linux Enterprise 15 SP5 -- Fedora 39, 40 +- Fedora 39, 40, 41 Operating systems are supported until their vendor end-of-support dates, which can be found on the [Posit Platform Support](https://posit.co/about/platform-support/) @@ -168,6 +168,9 @@ curl -O https://cdn.posit.co/r/fedora-39/pkgs/R-${R_VERSION}-1-1.x86_64.rpm # Fedora 40 curl -O https://cdn.posit.co/r/fedora-40/pkgs/R-${R_VERSION}-1-1.x86_64.rpm + +# Fedora 41 +curl -O https://cdn.posit.co/r/fedora-41/pkgs/R-${R_VERSION}-1-1.x86_64.rpm ``` Then install the package: diff --git a/builder/Dockerfile.fedora-38 b/builder/Dockerfile.fedora-41 similarity index 93% rename from builder/Dockerfile.fedora-38 rename to builder/Dockerfile.fedora-41 index a5540dc..f58e739 100644 --- a/builder/Dockerfile.fedora-38 +++ b/builder/Dockerfile.fedora-41 @@ -1,6 +1,6 @@ -FROM fedora:38 +FROM fedora:41 -ENV OS_IDENTIFIER fedora-38 +ENV OS_IDENTIFIER fedora-41 RUN dnf -y upgrade \ && dnf -y install dnf-plugins-core \ @@ -58,7 +58,7 @@ RUN curl -LO "https://github.com/goreleaser/nfpm/releases/download/v2.18.1/nfpm_ RUN chmod 0777 /opt -# Configure flags that don't use the defaults in build.sh +# Configure flags for that don't use the defaults in build.sh ENV CONFIGURE_OPTIONS="\ --enable-R-shlib \ --with-tcltk \ @@ -82,7 +82,7 @@ ENV JAVA_HOME=/usr/lib/jvm/jre-11-openjdk # R 3.x requires PCRE2 for Pango support on RHEL 9 ENV INCLUDE_PCRE2_IN_R_3 yes -COPY package.fedora-38 /package.sh +COPY package.fedora-41 /package.sh COPY build.sh . COPY patches /patches ENTRYPOINT ./build.sh diff --git a/builder/docker-compose.yml b/builder/docker-compose.yml index 3b485a4..871aa64 100644 --- a/builder/docker-compose.yml +++ b/builder/docker-compose.yml @@ -131,7 +131,7 @@ services: image: r-builds:opensuse-156 volumes: - ./integration/tmp:/tmp/output - fedora-38: + fedora-39: command: ./build.sh environment: - R_VERSION=${R_VERSION} @@ -139,11 +139,11 @@ services: - LOCAL_STORE=/tmp/output build: context: . - dockerfile: Dockerfile.fedora-38 - image: r-builds:fedora-38 + dockerfile: Dockerfile.fedora-39 + image: r-builds:fedora-39 volumes: - ./integration/tmp:/tmp/output - fedora-39: + fedora-40: command: ./build.sh environment: - R_VERSION=${R_VERSION} @@ -151,11 +151,11 @@ services: - LOCAL_STORE=/tmp/output build: context: . - dockerfile: Dockerfile.fedora-39 - image: r-builds:fedora-39 + dockerfile: Dockerfile.fedora-40 + image: r-builds:fedora-40 volumes: - ./integration/tmp:/tmp/output - fedora-40: + fedora-41: command: ./build.sh environment: - R_VERSION=${R_VERSION} @@ -163,7 +163,7 @@ services: - LOCAL_STORE=/tmp/output build: context: . - dockerfile: Dockerfile.fedora-40 - image: r-builds:fedora-40 + dockerfile: Dockerfile.fedora-41 + image: r-builds:fedora-41 volumes: - ./integration/tmp:/tmp/output diff --git a/builder/package.fedora-38 b/builder/package.fedora-41 similarity index 98% rename from builder/package.fedora-38 rename to builder/package.fedora-41 index 9a7151f..b05bab1 100644 --- a/builder/package.fedora-38 +++ b/builder/package.fedora-41 @@ -56,6 +56,7 @@ ${pcre_libs} - tcl - tk - unzip +- util-linux-core - which - xz-devel - zip diff --git a/serverless-resources.yml b/serverless-resources.yml index a6da9cd..02deff4 100644 --- a/serverless-resources.yml +++ b/serverless-resources.yml @@ -285,7 +285,7 @@ rBuildsBatchJobDefinitionOpensuse156: Image: !Sub "${AWS::AccountId}.dkr.ecr.${AWS::Region}.amazonaws.com/r-builds:opensuse-156" Timeout: AttemptDurationSeconds: 7200 -rBuildsBatchJobDefinitionFedora38: +rBuildsBatchJobDefinitionFedora39: Type: AWS::Batch::JobDefinition Properties: Type: container @@ -296,10 +296,10 @@ rBuildsBatchJobDefinitionFedora38: Memory: 4096 JobRoleArn: "Fn::GetAtt": [ rBuildsEcsTaskIamRole, Arn ] - Image: !Sub "${AWS::AccountId}.dkr.ecr.${AWS::Region}.amazonaws.com/r-builds:fedora-38" + Image: !Sub "${AWS::AccountId}.dkr.ecr.${AWS::Region}.amazonaws.com/r-builds:fedora-39" Timeout: AttemptDurationSeconds: 7200 -rBuildsBatchJobDefinitionFedora39: +rBuildsBatchJobDefinitionFedora40: Type: AWS::Batch::JobDefinition Properties: Type: container @@ -310,10 +310,10 @@ rBuildsBatchJobDefinitionFedora39: Memory: 4096 JobRoleArn: "Fn::GetAtt": [ rBuildsEcsTaskIamRole, Arn ] - Image: !Sub "${AWS::AccountId}.dkr.ecr.${AWS::Region}.amazonaws.com/r-builds:fedora-39" + Image: !Sub "${AWS::AccountId}.dkr.ecr.${AWS::Region}.amazonaws.com/r-builds:fedora-40" Timeout: AttemptDurationSeconds: 7200 -rBuildsBatchJobDefinitionFedora40: +rBuildsBatchJobDefinitionFedora41: Type: AWS::Batch::JobDefinition Properties: Type: container @@ -324,7 +324,7 @@ rBuildsBatchJobDefinitionFedora40: Memory: 4096 JobRoleArn: "Fn::GetAtt": [ rBuildsEcsTaskIamRole, Arn ] - Image: !Sub "${AWS::AccountId}.dkr.ecr.${AWS::Region}.amazonaws.com/r-builds:fedora-40" + Image: !Sub "${AWS::AccountId}.dkr.ecr.${AWS::Region}.amazonaws.com/r-builds:fedora-41" Timeout: AttemptDurationSeconds: 7200 diff --git a/serverless.yml b/serverless.yml index 2c070b6..e5bf0df 100644 --- a/serverless.yml +++ b/serverless.yml @@ -77,13 +77,13 @@ provider: Ref: rBuildsBatchJobDefinitionOpensuse155 JOB_DEFINITION_ARN_opensuse_156: Ref: rBuildsBatchJobDefinitionOpensuse156 - JOB_DEFINITION_ARN_fedora_38: - Ref: rBuildsBatchJobDefinitionFedora38 JOB_DEFINITION_ARN_fedora_39: Ref: rBuildsBatchJobDefinitionFedora39 JOB_DEFINITION_ARN_fedora_40: Ref: rBuildsBatchJobDefinitionFedora40 - SUPPORTED_PLATFORMS: ubuntu-2004,ubuntu-2204,ubuntu-2404,debian-10,debian-11,debian-12,centos-7,centos-8,rhel-9,opensuse-155,opensuse-156,fedora-38,fedora-39,fedora-40 + JOB_DEFINITION_ARN_fedora_41: + Ref: rBuildsBatchJobDefinitionFedora41 + SUPPORTED_PLATFORMS: ubuntu-2004,ubuntu-2204,ubuntu-2404,debian-10,debian-11,debian-12,centos-7,centos-8,rhel-9,opensuse-155,opensuse-156,fedora-39,fedora-40,fedora-41 functions: queueBuilds: diff --git a/test/docker-compose.yml b/test/docker-compose.yml index bc82c60..94a26ba 100644 --- a/test/docker-compose.yml +++ b/test/docker-compose.yml @@ -89,14 +89,6 @@ services: - R_VERSION=${R_VERSION} volumes: - ../:/r-builds - fedora-38: - image: fedora:38 - command: /r-builds/test/test-yum.sh - environment: - - OS_IDENTIFIER=fedora-38 - - R_VERSION=${R_VERSION} - volumes: - - ../:/r-builds fedora-39: image: fedora:39 command: /r-builds/test/test-yum.sh @@ -113,3 +105,11 @@ services: - R_VERSION=${R_VERSION} volumes: - ../:/r-builds + fedora-41: + image: fedora:41 + command: /r-builds/test/test-yum.sh + environment: + - OS_IDENTIFIER=fedora-41 + - R_VERSION=${R_VERSION} + volumes: + - ../:/r-builds From 8982a86d6872ce344e9fb2353752c6fb3c150510 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A1bor=20Cs=C3=A1rdi?= Date: Sun, 3 Nov 2024 22:36:22 +0100 Subject: [PATCH 2/3] Patch older R versions on Fedora 41 --- builder/patches/R-3.0.0-fedora-41.patch | 1 + builder/patches/R-3.0.1-fedora-41.patch | 1 + builder/patches/R-3.0.2-fedora-41.patch | 1 + builder/patches/R-3.0.3-fedora-41.patch | 1 + builder/patches/R-3.1.0-fedora-41.patch | 1 + builder/patches/R-3.1.1-fedora-41.patch | 1 + builder/patches/R-3.1.2-fedora-41.patch | 1 + builder/patches/R-3.1.3-fedora-41.patch | 1 + builder/patches/R-3.2.0-fedora-41.patch | 1 + builder/patches/R-3.2.1-fedora-41.patch | 1 + builder/patches/R-3.2.2-fedora-41.patch | 1 + builder/patches/R-3.2.3-fedora-41.patch | 1 + builder/patches/R-3.2.4-fedora-41.patch | 1 + builder/patches/R-3.2.5-fedora-41.patch | 1 + builder/patches/R-3.3.0-fedora-41.patch | 1 + builder/patches/R-3.3.1-fedora-41.patch | 1 + builder/patches/R-3.3.2-fedora-41.patch | 1 + builder/patches/R-3.3.3-fedora-41.patch | 1 + builder/patches/R-3.4.0-fedora-41.patch | 1 + builder/patches/R-3.4.1-fedora-41.patch | 1 + builder/patches/R-3.4.2-fedora-41.patch | 1 + builder/patches/R-3.4.3-fedora-41.patch | 1 + builder/patches/R-3.4.4-fedora-41.patch | 1 + builder/patches/R-3.5.0-fedora-41.patch | 1 + builder/patches/R-3.5.1-fedora-41.patch | 1 + builder/patches/R-3.5.2-fedora-41.patch | 1 + builder/patches/R-3.5.3-fedora-41.patch | 1 + builder/patches/R-3.6.0-fedora-41.patch | 1 + builder/patches/R-3.6.1-fedora-41.patch | 1 + builder/patches/R-3.6.2-fedora-41.patch | 1 + builder/patches/R-3.6.3-fedora-41.patch | 1 + builder/patches/R-4.0.0-fedora-41.patch | 1 + builder/patches/R-4.0.1-fedora-41.patch | 1 + builder/patches/R-4.0.2-fedora-41.patch | 1 + 34 files changed, 34 insertions(+) create mode 120000 builder/patches/R-3.0.0-fedora-41.patch create mode 120000 builder/patches/R-3.0.1-fedora-41.patch create mode 120000 builder/patches/R-3.0.2-fedora-41.patch create mode 120000 builder/patches/R-3.0.3-fedora-41.patch create mode 120000 builder/patches/R-3.1.0-fedora-41.patch create mode 120000 builder/patches/R-3.1.1-fedora-41.patch create mode 120000 builder/patches/R-3.1.2-fedora-41.patch create mode 120000 builder/patches/R-3.1.3-fedora-41.patch create mode 120000 builder/patches/R-3.2.0-fedora-41.patch create mode 120000 builder/patches/R-3.2.1-fedora-41.patch create mode 120000 builder/patches/R-3.2.2-fedora-41.patch create mode 120000 builder/patches/R-3.2.3-fedora-41.patch create mode 120000 builder/patches/R-3.2.4-fedora-41.patch create mode 120000 builder/patches/R-3.2.5-fedora-41.patch create mode 120000 builder/patches/R-3.3.0-fedora-41.patch create mode 120000 builder/patches/R-3.3.1-fedora-41.patch create mode 120000 builder/patches/R-3.3.2-fedora-41.patch create mode 120000 builder/patches/R-3.3.3-fedora-41.patch create mode 120000 builder/patches/R-3.4.0-fedora-41.patch create mode 120000 builder/patches/R-3.4.1-fedora-41.patch create mode 120000 builder/patches/R-3.4.2-fedora-41.patch create mode 120000 builder/patches/R-3.4.3-fedora-41.patch create mode 120000 builder/patches/R-3.4.4-fedora-41.patch create mode 120000 builder/patches/R-3.5.0-fedora-41.patch create mode 120000 builder/patches/R-3.5.1-fedora-41.patch create mode 120000 builder/patches/R-3.5.2-fedora-41.patch create mode 120000 builder/patches/R-3.5.3-fedora-41.patch create mode 120000 builder/patches/R-3.6.0-fedora-41.patch create mode 120000 builder/patches/R-3.6.1-fedora-41.patch create mode 120000 builder/patches/R-3.6.2-fedora-41.patch create mode 120000 builder/patches/R-3.6.3-fedora-41.patch create mode 120000 builder/patches/R-4.0.0-fedora-41.patch create mode 120000 builder/patches/R-4.0.1-fedora-41.patch create mode 120000 builder/patches/R-4.0.2-fedora-41.patch diff --git a/builder/patches/R-3.0.0-fedora-41.patch b/builder/patches/R-3.0.0-fedora-41.patch new file mode 120000 index 0000000..074cecf --- /dev/null +++ b/builder/patches/R-3.0.0-fedora-41.patch @@ -0,0 +1 @@ +R-3.0.0-fedora-40.patch \ No newline at end of file diff --git a/builder/patches/R-3.0.1-fedora-41.patch b/builder/patches/R-3.0.1-fedora-41.patch new file mode 120000 index 0000000..56343bb --- /dev/null +++ b/builder/patches/R-3.0.1-fedora-41.patch @@ -0,0 +1 @@ +R-3.0.1-fedora-40.patch \ No newline at end of file diff --git a/builder/patches/R-3.0.2-fedora-41.patch b/builder/patches/R-3.0.2-fedora-41.patch new file mode 120000 index 0000000..0227625 --- /dev/null +++ b/builder/patches/R-3.0.2-fedora-41.patch @@ -0,0 +1 @@ +R-3.0.2-fedora-40.patch \ No newline at end of file diff --git a/builder/patches/R-3.0.3-fedora-41.patch b/builder/patches/R-3.0.3-fedora-41.patch new file mode 120000 index 0000000..0b8ea4a --- /dev/null +++ b/builder/patches/R-3.0.3-fedora-41.patch @@ -0,0 +1 @@ +R-3.0.3-fedora-40.patch \ No newline at end of file diff --git a/builder/patches/R-3.1.0-fedora-41.patch b/builder/patches/R-3.1.0-fedora-41.patch new file mode 120000 index 0000000..7c550fa --- /dev/null +++ b/builder/patches/R-3.1.0-fedora-41.patch @@ -0,0 +1 @@ +R-3.1.0-fedora-40.patch \ No newline at end of file diff --git a/builder/patches/R-3.1.1-fedora-41.patch b/builder/patches/R-3.1.1-fedora-41.patch new file mode 120000 index 0000000..f1d17d9 --- /dev/null +++ b/builder/patches/R-3.1.1-fedora-41.patch @@ -0,0 +1 @@ +R-3.1.1-fedora-40.patch \ No newline at end of file diff --git a/builder/patches/R-3.1.2-fedora-41.patch b/builder/patches/R-3.1.2-fedora-41.patch new file mode 120000 index 0000000..99b12ae --- /dev/null +++ b/builder/patches/R-3.1.2-fedora-41.patch @@ -0,0 +1 @@ +R-3.1.2-fedora-40.patch \ No newline at end of file diff --git a/builder/patches/R-3.1.3-fedora-41.patch b/builder/patches/R-3.1.3-fedora-41.patch new file mode 120000 index 0000000..1ec0916 --- /dev/null +++ b/builder/patches/R-3.1.3-fedora-41.patch @@ -0,0 +1 @@ +R-3.1.3-fedora-40.patch \ No newline at end of file diff --git a/builder/patches/R-3.2.0-fedora-41.patch b/builder/patches/R-3.2.0-fedora-41.patch new file mode 120000 index 0000000..bd2a55e --- /dev/null +++ b/builder/patches/R-3.2.0-fedora-41.patch @@ -0,0 +1 @@ +R-3.2.0-fedora-40.patch \ No newline at end of file diff --git a/builder/patches/R-3.2.1-fedora-41.patch b/builder/patches/R-3.2.1-fedora-41.patch new file mode 120000 index 0000000..18bb60a --- /dev/null +++ b/builder/patches/R-3.2.1-fedora-41.patch @@ -0,0 +1 @@ +R-3.2.1-fedora-40.patch \ No newline at end of file diff --git a/builder/patches/R-3.2.2-fedora-41.patch b/builder/patches/R-3.2.2-fedora-41.patch new file mode 120000 index 0000000..3aad49b --- /dev/null +++ b/builder/patches/R-3.2.2-fedora-41.patch @@ -0,0 +1 @@ +R-3.2.2-fedora-40.patch \ No newline at end of file diff --git a/builder/patches/R-3.2.3-fedora-41.patch b/builder/patches/R-3.2.3-fedora-41.patch new file mode 120000 index 0000000..70063bb --- /dev/null +++ b/builder/patches/R-3.2.3-fedora-41.patch @@ -0,0 +1 @@ +R-3.2.3-fedora-40.patch \ No newline at end of file diff --git a/builder/patches/R-3.2.4-fedora-41.patch b/builder/patches/R-3.2.4-fedora-41.patch new file mode 120000 index 0000000..8abd673 --- /dev/null +++ b/builder/patches/R-3.2.4-fedora-41.patch @@ -0,0 +1 @@ +R-3.2.4-fedora-40.patch \ No newline at end of file diff --git a/builder/patches/R-3.2.5-fedora-41.patch b/builder/patches/R-3.2.5-fedora-41.patch new file mode 120000 index 0000000..842af76 --- /dev/null +++ b/builder/patches/R-3.2.5-fedora-41.patch @@ -0,0 +1 @@ +R-3.2.5-fedora-40.patch \ No newline at end of file diff --git a/builder/patches/R-3.3.0-fedora-41.patch b/builder/patches/R-3.3.0-fedora-41.patch new file mode 120000 index 0000000..7c38f26 --- /dev/null +++ b/builder/patches/R-3.3.0-fedora-41.patch @@ -0,0 +1 @@ +R-3.3.0-fedora-40.patch \ No newline at end of file diff --git a/builder/patches/R-3.3.1-fedora-41.patch b/builder/patches/R-3.3.1-fedora-41.patch new file mode 120000 index 0000000..4cb3e4b --- /dev/null +++ b/builder/patches/R-3.3.1-fedora-41.patch @@ -0,0 +1 @@ +R-3.3.1-fedora-40.patch \ No newline at end of file diff --git a/builder/patches/R-3.3.2-fedora-41.patch b/builder/patches/R-3.3.2-fedora-41.patch new file mode 120000 index 0000000..338c3c3 --- /dev/null +++ b/builder/patches/R-3.3.2-fedora-41.patch @@ -0,0 +1 @@ +R-3.3.2-fedora-40.patch \ No newline at end of file diff --git a/builder/patches/R-3.3.3-fedora-41.patch b/builder/patches/R-3.3.3-fedora-41.patch new file mode 120000 index 0000000..d708668 --- /dev/null +++ b/builder/patches/R-3.3.3-fedora-41.patch @@ -0,0 +1 @@ +R-3.3.3-fedora-40.patch \ No newline at end of file diff --git a/builder/patches/R-3.4.0-fedora-41.patch b/builder/patches/R-3.4.0-fedora-41.patch new file mode 120000 index 0000000..7ca2f7d --- /dev/null +++ b/builder/patches/R-3.4.0-fedora-41.patch @@ -0,0 +1 @@ +R-3.4.0-fedora-40.patch \ No newline at end of file diff --git a/builder/patches/R-3.4.1-fedora-41.patch b/builder/patches/R-3.4.1-fedora-41.patch new file mode 120000 index 0000000..ed3211a --- /dev/null +++ b/builder/patches/R-3.4.1-fedora-41.patch @@ -0,0 +1 @@ +R-3.4.1-fedora-40.patch \ No newline at end of file diff --git a/builder/patches/R-3.4.2-fedora-41.patch b/builder/patches/R-3.4.2-fedora-41.patch new file mode 120000 index 0000000..a60ee84 --- /dev/null +++ b/builder/patches/R-3.4.2-fedora-41.patch @@ -0,0 +1 @@ +R-3.4.2-fedora-40.patch \ No newline at end of file diff --git a/builder/patches/R-3.4.3-fedora-41.patch b/builder/patches/R-3.4.3-fedora-41.patch new file mode 120000 index 0000000..85c139a --- /dev/null +++ b/builder/patches/R-3.4.3-fedora-41.patch @@ -0,0 +1 @@ +R-3.4.3-fedora-40.patch \ No newline at end of file diff --git a/builder/patches/R-3.4.4-fedora-41.patch b/builder/patches/R-3.4.4-fedora-41.patch new file mode 120000 index 0000000..6357b68 --- /dev/null +++ b/builder/patches/R-3.4.4-fedora-41.patch @@ -0,0 +1 @@ +R-3.4.4-fedora-40.patch \ No newline at end of file diff --git a/builder/patches/R-3.5.0-fedora-41.patch b/builder/patches/R-3.5.0-fedora-41.patch new file mode 120000 index 0000000..f7a805a --- /dev/null +++ b/builder/patches/R-3.5.0-fedora-41.patch @@ -0,0 +1 @@ +R-3.5.0-fedora-40.patch \ No newline at end of file diff --git a/builder/patches/R-3.5.1-fedora-41.patch b/builder/patches/R-3.5.1-fedora-41.patch new file mode 120000 index 0000000..b096435 --- /dev/null +++ b/builder/patches/R-3.5.1-fedora-41.patch @@ -0,0 +1 @@ +R-3.5.1-fedora-40.patch \ No newline at end of file diff --git a/builder/patches/R-3.5.2-fedora-41.patch b/builder/patches/R-3.5.2-fedora-41.patch new file mode 120000 index 0000000..da3d19e --- /dev/null +++ b/builder/patches/R-3.5.2-fedora-41.patch @@ -0,0 +1 @@ +R-3.5.2-fedora-40.patch \ No newline at end of file diff --git a/builder/patches/R-3.5.3-fedora-41.patch b/builder/patches/R-3.5.3-fedora-41.patch new file mode 120000 index 0000000..c07bfba --- /dev/null +++ b/builder/patches/R-3.5.3-fedora-41.patch @@ -0,0 +1 @@ +R-3.5.3-fedora-40.patch \ No newline at end of file diff --git a/builder/patches/R-3.6.0-fedora-41.patch b/builder/patches/R-3.6.0-fedora-41.patch new file mode 120000 index 0000000..e166856 --- /dev/null +++ b/builder/patches/R-3.6.0-fedora-41.patch @@ -0,0 +1 @@ +R-3.6.0-fedora-40.patch \ No newline at end of file diff --git a/builder/patches/R-3.6.1-fedora-41.patch b/builder/patches/R-3.6.1-fedora-41.patch new file mode 120000 index 0000000..68a3f0e --- /dev/null +++ b/builder/patches/R-3.6.1-fedora-41.patch @@ -0,0 +1 @@ +R-3.6.1-fedora-40.patch \ No newline at end of file diff --git a/builder/patches/R-3.6.2-fedora-41.patch b/builder/patches/R-3.6.2-fedora-41.patch new file mode 120000 index 0000000..10912b0 --- /dev/null +++ b/builder/patches/R-3.6.2-fedora-41.patch @@ -0,0 +1 @@ +R-3.6.2-fedora-40.patch \ No newline at end of file diff --git a/builder/patches/R-3.6.3-fedora-41.patch b/builder/patches/R-3.6.3-fedora-41.patch new file mode 120000 index 0000000..0209342 --- /dev/null +++ b/builder/patches/R-3.6.3-fedora-41.patch @@ -0,0 +1 @@ +R-3.6.3-fedora-40.patch \ No newline at end of file diff --git a/builder/patches/R-4.0.0-fedora-41.patch b/builder/patches/R-4.0.0-fedora-41.patch new file mode 120000 index 0000000..3a920da --- /dev/null +++ b/builder/patches/R-4.0.0-fedora-41.patch @@ -0,0 +1 @@ +R-4.0.0-fedora-40.patch \ No newline at end of file diff --git a/builder/patches/R-4.0.1-fedora-41.patch b/builder/patches/R-4.0.1-fedora-41.patch new file mode 120000 index 0000000..d21c752 --- /dev/null +++ b/builder/patches/R-4.0.1-fedora-41.patch @@ -0,0 +1 @@ +R-4.0.1-fedora-40.patch \ No newline at end of file diff --git a/builder/patches/R-4.0.2-fedora-41.patch b/builder/patches/R-4.0.2-fedora-41.patch new file mode 120000 index 0000000..b41866e --- /dev/null +++ b/builder/patches/R-4.0.2-fedora-41.patch @@ -0,0 +1 @@ +R-4.0.2-fedora-40.patch \ No newline at end of file From 3da96017447162d95f4feacbc64c09df2fbdd440 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A1bor=20Cs=C3=A1rdi?= Date: Mon, 4 Nov 2024 07:57:40 +0100 Subject: [PATCH 3/3] Allow R 3.0.x for test package --- test/testpkg/DESCRIPTION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/testpkg/DESCRIPTION b/test/testpkg/DESCRIPTION index 8ab34d8..f06c88c 100644 --- a/test/testpkg/DESCRIPTION +++ b/test/testpkg/DESCRIPTION @@ -6,7 +6,7 @@ Authors@R: person("Test", "Pkg", email = "test@test", role = c("aut", "cre")) Description: A test package. License: MIT Depends: - R (>= 3.1) + R (>= 3.0) SystemRequirements: C++11 RoxygenNote: 6.1.1 Encoding: UTF-8