From 2570d89ee4fdf0dd078be5153a7be7eaa6dbf7a840305e7c04dfd7f691eeb20f Mon Sep 17 00:00:00 2001 From: Giacomo Leidi Date: Tue, 10 Sep 2024 11:32:52 +0200 Subject: [PATCH 1/3] _config: avoid choice libcurl-mini4 / libcurl4 (SR#344301) --- _config | 3 +++ 1 file changed, 3 insertions(+) diff --git a/_config b/_config index 8e77523..e37b31a 100644 --- a/_config +++ b/_config @@ -1356,6 +1356,9 @@ Prefer: -mbedtls-2-devel # have choice for findutils-locate needed by catfish: mlocate plocate Prefer: -plocate +# avoid choice libcurl-mini4 / libcurl4 +Prefer: -libcurl-mini4 + # hmac packages were merged into main, but still exist in Workbench Substitute: libfreebl3-hmac libfreebl3 Substitute: libsoftokn3-hmac libsoftokn3 From 2b8dde5fd9a9efb6c62d09d185ec339d2a54be7a0346bf3ce0f7e53d18ac80e6 Mon Sep 17 00:00:00 2001 From: Giacomo Leidi Date: Tue, 10 Sep 2024 11:34:35 +0200 Subject: [PATCH 2/3] _config: fix nothing provides /usr/bin/less for git-core. --- _config | 1 + 1 file changed, 1 insertion(+) diff --git a/_config b/_config index e37b31a..37b40b6 100644 --- a/_config +++ b/_config @@ -575,6 +575,7 @@ FileProvides: /usr/bin/jpegtran libjpeg-turbo FileProvides: /usr/bin/kill busybox-util-linux util-linux FileProvides: /usr/bin/killall busybox-psmisc psmisc FileProvides: /usr/bin/ksh93 ksh +FileProvides: /usr/bin/less less FileProvides: /usr/bin/ln busybox-coreutils coreutils coreutils-single FileProvides: /usr/bin/locale glibc FileProvides: /usr/bin/localedef glibc From a9cdffbf79305ca237cd5e6b04dc83dcc14b5665d90545f99c4754dd3d149141 Mon Sep 17 00:00:00 2001 From: Giacomo Leidi Date: Mon, 23 Sep 2024 12:52:30 +0200 Subject: [PATCH 3/3] _config: Allow flatpak to build (SR#343372) --- _config | 3 +++ 1 file changed, 3 insertions(+) diff --git a/_config b/_config index 37b40b6..dface61 100644 --- a/_config +++ b/_config @@ -829,6 +829,9 @@ Preinstall: libbz2-1 libgcc_s1 libncurses6 libreadline8 libz1 libselinux1 Preinstall: libgcrypt20 libgpg-error0 liblzma5 libcap2 libacl1 libattr1 Preinstall: libpopt0 libelf1 libzstd1 libpcre2-8-0 +# error: selabel_open: (/etc/selinux/targeted/contexts/files/file_contexts) No such file or directory +Preinstall: selinux-policy-targeted + #Runscripts: aaa_base Prefer: libdb-4_8-devel