From 11daa091e4a4a432a8182455da26350fc2ea87f5 Mon Sep 17 00:00:00 2001 From: Michael Mayer Date: Thu, 5 Dec 2024 12:38:45 +0100 Subject: [PATCH] add a few more --- inst/sysreqs/rules/gpgme.json | 14 -------------- inst/sysreqs/rules/libarchive.json | 17 ++++------------- inst/sysreqs/rules/libprotobuf.json | 14 -------------- inst/sysreqs/rules/tesseract.json | 2 +- 4 files changed, 5 insertions(+), 42 deletions(-) diff --git a/inst/sysreqs/rules/gpgme.json b/inst/sysreqs/rules/gpgme.json index 13d1a188..2ed11f06 100644 --- a/inst/sysreqs/rules/gpgme.json +++ b/inst/sysreqs/rules/gpgme.json @@ -61,20 +61,6 @@ } ] }, - { - "packages": ["gpgme-devel"], - "pre_install": [ - { "command": "dnf install -y dnf-plugins-core" }, - { "command": "dnf config-manager --set-enabled powertools" } - ], - "constraints": [ - { - "os": "linux", - "distribution": "rockylinux", - "versions": ["8"] - } - ] - }, { "packages": ["gpgme"], "constraints": [ diff --git a/inst/sysreqs/rules/libarchive.json b/inst/sysreqs/rules/libarchive.json index 5ca49f85..19bdb2c7 100644 --- a/inst/sysreqs/rules/libarchive.json +++ b/inst/sysreqs/rules/libarchive.json @@ -39,20 +39,11 @@ "os": "linux", "distribution": "centos", "versions": ["8"] - } - ] - }, - { - "packages": ["libarchive-devel"], - "pre_install": [ - { "command": "dnf install -y dnf-plugins-core" }, - { "command": "dnf config-manager --set-enabled crb" } - ], - "constraints": [ + }, { "os": "linux", "distribution": "rockylinux", - "versions": ["9"] + "versions": ["8"] } ] }, @@ -60,13 +51,13 @@ "packages": ["libarchive-devel"], "pre_install": [ { "command": "dnf install -y dnf-plugins-core" }, - { "command": "dnf config-manager --set-enabled powertools" } + { "command": "dnf config-manager --set-enabled crb" } ], "constraints": [ { "os": "linux", "distribution": "rockylinux", - "versions": ["8"] + "versions": ["9"] } ] }, diff --git a/inst/sysreqs/rules/libprotobuf.json b/inst/sysreqs/rules/libprotobuf.json index a3b7ceee..12b11411 100644 --- a/inst/sysreqs/rules/libprotobuf.json +++ b/inst/sysreqs/rules/libprotobuf.json @@ -81,20 +81,6 @@ } ] }, - { - "packages": ["protobuf-devel"], - "pre_install": [ - { "command": "dnf install -y dnf-plugins-core" }, - { "command": "dnf config-manager --set-enabled powertools" } - ], - "constraints": [ - { - "os": "linux", - "distribution": "rockylinux", - "versions": ["8"] - } - ] - }, { "packages": ["protobuf"], "constraints": [ diff --git a/inst/sysreqs/rules/tesseract.json b/inst/sysreqs/rules/tesseract.json index c1b721ba..aae459ab 100644 --- a/inst/sysreqs/rules/tesseract.json +++ b/inst/sysreqs/rules/tesseract.json @@ -48,7 +48,7 @@ { "os": "linux", "distribution": "centos", - "versions": ["8"], + "versions": ["8"] }, { "os": "linux",