From 9046ceace4b2193d55dbf985a070832e976a8e02 Mon Sep 17 00:00:00 2001 From: "Bernhard M. Wiedemann" Date: Sat, 9 Nov 2024 01:09:38 +0000 Subject: [PATCH] update 2024-11-09 01:09 --- packages/_/_project/_config | 5 ++++- packages/_/_project/_staging_workflow | 8 ++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/packages/_/_project/_config b/packages/_/_project/_config index c8d3aab8d4a..b0040ef9225 100644 --- a/packages/_/_project/_config +++ b/packages/_/_project/_config @@ -607,6 +607,9 @@ Prefer: -python310-pypdf -python311-pypdf -python312-pypdf # have choice for pkgconfig(libmarkdown): libmarkdown-devel libmarkdown2-devel Prefer: -libmarkdown2-devel +# have choice for rubygem(ruby:3.3.0:puma) >= 5.0: ruby3.3-rubygem-puma ruby3.3-rubygem-puma-5, have choice for rubygem(ruby:3.3.0:rack-test) >= 0.6.3 needed by ruby3.3-rubygem-actionpack-7.0: ruby3.3-rubygem-rack-test ruby3.3-rubygem-rack-test-0_6 +Prefer: -ruby3.3-rubygem-puma-5 -ruby3.3-rubygem-rack-test-0_6 + # unresolvable: have choice for cmake(lxqt-build-tools) >= 0.8.0: lxqt-build-tools-devel lxqt-build-tools-qt5-devel Prefer: -lxqt-build-tools-devel @@ -1060,7 +1063,7 @@ Prefer: apache2-mod_%{php_pref} Prefer: php8:php8-cli # have choice for libomp.so()(64bit) needed by libispcrt1: libomp15-devel libomp16-devel -Prefer: -libomp15-devel -libomp16-devel -libomp17-devel +Prefer: -libomp15-devel -libomp16-devel -libomp17-devel -libomp18-devel # have choice for python3dist(jupyterlab) = 3.6.2 needed by jupyter-jupyterlab: python310-jupyterlab python311-jupyterlab python38-jupyterlab python39-jupyterlab Prefer: -python310-jupyterlab diff --git a/packages/_/_project/_staging_workflow b/packages/_/_project/_staging_workflow index 8212bd1c926..63a93fe440c 100644 --- a/packages/_/_project/_staging_workflow +++ b/packages/_/_project/_staging_workflow @@ -52,4 +52,12 @@ + + + + + + + +