Merge branch 'main' into feature/arm64
This commit is contained in:
commit
fc4212278b
12 changed files with 47 additions and 47 deletions
|
|
@ -94,7 +94,7 @@ ENV CONFIGURE_OPTIONS="\
|
|||
# but the JDK path is chosen by default. We change this to the JRE path to
|
||||
# support users who only want to install the JRE (non-devel) package.
|
||||
# https://cran.r-project.org/doc/manuals/r-release/R-admin.html#Java-support
|
||||
# https://solutions.rstudio.com/r/using-rjava/
|
||||
# https://solutions.posit.co/envs-pkgs/using-rjava/
|
||||
ENV JAVA_HOME=/usr/lib64/jvm/jre-11-openjdk
|
||||
|
||||
COPY package.opensuse-154 /package.sh
|
||||
|
|
|
|||
|
|
@ -81,7 +81,7 @@ ENV R_RD4PDF="times,hyper"
|
|||
# requires users to run `R CMD javareconf` even on minor/patch upgrades. Use the
|
||||
# major version symlink to avoid this.
|
||||
# https://cran.r-project.org/doc/manuals/r-release/R-admin.html#Java-support
|
||||
# https://solutions.rstudio.com/r/using-rjava/
|
||||
# https://solutions.posit.co/envs-pkgs/using-rjava/
|
||||
ENV JAVA_HOME=/usr/lib/jvm/jre-11-openjdk
|
||||
|
||||
# R 3.x requires PCRE2 for Pango support on RHEL 9
|
||||
|
|
|
|||
|
|
@ -31,10 +31,10 @@ version: 1
|
|||
version_schema: none
|
||||
arch: $(cat /tmp/arch)
|
||||
release: 1
|
||||
maintainer: RStudio, PBC <https://github.com/rstudio/r-builds>
|
||||
maintainer: Posit Software, PBC <https://github.com/rstudio/r-builds>
|
||||
description: |
|
||||
GNU R statistical computation and graphics system
|
||||
vendor: RStudio, PBC
|
||||
vendor: Posit Software, PBC
|
||||
homepage: https://www.r-project.org
|
||||
license: GPLv2+
|
||||
depends:
|
||||
|
|
|
|||
|
|
@ -31,10 +31,10 @@ version: 1
|
|||
version_schema: none
|
||||
arch: $(cat /tmp/arch)
|
||||
release: 1
|
||||
maintainer: RStudio, PBC <https://github.com/rstudio/r-builds>
|
||||
maintainer: Posit Software, PBC <https://github.com/rstudio/r-builds>
|
||||
description: |
|
||||
GNU R statistical computation and graphics system
|
||||
vendor: RStudio, PBC
|
||||
vendor: Posit Software, PBC
|
||||
homepage: https://www.r-project.org
|
||||
license: GPLv2+
|
||||
depends:
|
||||
|
|
|
|||
|
|
@ -17,10 +17,10 @@ version_schema: none
|
|||
section: gnu-r
|
||||
arch: $(dpkg --print-architecture)
|
||||
priority: optional
|
||||
maintainer: RStudio, PBC <https://github.com/rstudio/r-builds>
|
||||
maintainer: Posit Software, PBC <https://github.com/rstudio/r-builds>
|
||||
description: |
|
||||
GNU R statistical computation and graphics system
|
||||
vendor: RStudio, PBC
|
||||
vendor: Posit Software, PBC
|
||||
homepage: https://www.r-project.org
|
||||
license: GPL-2
|
||||
deb:
|
||||
|
|
|
|||
|
|
@ -18,10 +18,10 @@ version_schema: none
|
|||
section: gnu-r
|
||||
arch: $(dpkg --print-architecture)
|
||||
priority: optional
|
||||
maintainer: RStudio, PBC <https://github.com/rstudio/r-builds>
|
||||
maintainer: Posit Software, PBC <https://github.com/rstudio/r-builds>
|
||||
description: |
|
||||
GNU R statistical computation and graphics system
|
||||
vendor: RStudio, PBC
|
||||
vendor: Posit Software, PBC
|
||||
homepage: https://www.r-project.org
|
||||
license: GPL-2
|
||||
deb:
|
||||
|
|
|
|||
|
|
@ -31,10 +31,10 @@ version: 1
|
|||
version_schema: none
|
||||
arch: $(cat /tmp/arch)
|
||||
release: 1
|
||||
maintainer: RStudio, PBC <https://github.com/rstudio/r-builds>
|
||||
maintainer: Posit Software, PBC <https://github.com/rstudio/r-builds>
|
||||
description: |
|
||||
GNU R statistical computation and graphics system
|
||||
vendor: RStudio, PBC
|
||||
vendor: Posit Software, PBC
|
||||
homepage: https://www.r-project.org
|
||||
license: GPLv2+
|
||||
depends:
|
||||
|
|
|
|||
|
|
@ -47,10 +47,10 @@ version: 1
|
|||
version_schema: none
|
||||
arch: $(cat /tmp/arch)
|
||||
release: 1
|
||||
maintainer: RStudio, PBC <https://github.com/rstudio/r-builds>
|
||||
maintainer: Posit Software, PBC <https://github.com/rstudio/r-builds>
|
||||
description: |
|
||||
GNU R statistical computation and graphics system
|
||||
vendor: RStudio, PBC
|
||||
vendor: Posit Software, PBC
|
||||
homepage: https://www.r-project.org
|
||||
license: GPLv2+
|
||||
depends:
|
||||
|
|
|
|||
|
|
@ -48,10 +48,10 @@ version: 1
|
|||
version_schema: none
|
||||
arch: $(cat /tmp/arch)
|
||||
release: 1
|
||||
maintainer: RStudio, PBC <https://github.com/rstudio/r-builds>
|
||||
maintainer: Posit Software, PBC <https://github.com/rstudio/r-builds>
|
||||
description: |
|
||||
GNU R statistical computation and graphics system
|
||||
vendor: RStudio, PBC
|
||||
vendor: Posit Software, PBC
|
||||
homepage: https://www.r-project.org
|
||||
license: GPLv2+
|
||||
depends:
|
||||
|
|
|
|||
|
|
@ -17,10 +17,10 @@ version_schema: none
|
|||
section: universe/math
|
||||
arch: $(dpkg --print-architecture)
|
||||
priority: optional
|
||||
maintainer: RStudio, PBC <https://github.com/rstudio/r-builds>
|
||||
maintainer: Posit Software, PBC <https://github.com/rstudio/r-builds>
|
||||
description: |
|
||||
GNU R statistical computation and graphics system
|
||||
vendor: RStudio, PBC
|
||||
vendor: Posit Software, PBC
|
||||
homepage: https://www.r-project.org
|
||||
license: GPL-2
|
||||
deb:
|
||||
|
|
|
|||
|
|
@ -17,10 +17,10 @@ version_schema: none
|
|||
section: universe/math
|
||||
priority: optional
|
||||
arch: $(dpkg --print-architecture)
|
||||
maintainer: RStudio, PBC <https://github.com/rstudio/r-builds>
|
||||
maintainer: Posit Software, PBC <https://github.com/rstudio/r-builds>
|
||||
description: |
|
||||
GNU R statistical computation and graphics system
|
||||
vendor: RStudio, PBC
|
||||
vendor: Posit Software, PBC
|
||||
homepage: https://www.r-project.org
|
||||
license: GPL-2
|
||||
deb:
|
||||
|
|
|
|||
|
|
@ -18,10 +18,10 @@ version_schema: none
|
|||
section: universe/math
|
||||
priority: optional
|
||||
arch: $(dpkg --print-architecture)
|
||||
maintainer: RStudio, PBC <https://github.com/rstudio/r-builds>
|
||||
maintainer: Posit Software, PBC <https://github.com/rstudio/r-builds>
|
||||
description: |
|
||||
GNU R statistical computation and graphics system
|
||||
vendor: RStudio, PBC
|
||||
vendor: Posit Software, PBC
|
||||
homepage: https://www.r-project.org
|
||||
license: GPL-2
|
||||
deb:
|
||||
|
|
|
|||
Loading…
Reference in a new issue