products/SLFO
SHA256
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request '_config: Changes needed for updates from Factory' (#29) from gleidi/SLFO_main:staging-a into main

Browse Source 
Reviewed-on: https://src.suse.de/products/SLFO_main/pulls/29
Reviewed-by: Prokop Vlasin <pvlasin@noreply.src.suse.de>
Reviewed-by: Nathan Cutler <smithfarm@noreply.src.suse.de>
This commit is contained in:
Nathan Cutler 2024-09-23 13:37:47 +02:00
commit 9a29a7e6c0
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
_config
View File

@ -575,6 +575,7 @@ FileProvides: /usr/bin/jpegtran libjpeg-turbo
FileProvides: /usr/bin/kill busybox-util-linux util-linux FileProvides: /usr/bin/kill busybox-util-linux util-linux
FileProvides: /usr/bin/killall busybox-psmisc psmisc FileProvides: /usr/bin/killall busybox-psmisc psmisc
FileProvides: /usr/bin/ksh93 ksh FileProvides: /usr/bin/ksh93 ksh
FileProvides: /usr/bin/less less
FileProvides: /usr/bin/ln busybox-coreutils coreutils coreutils-single FileProvides: /usr/bin/ln busybox-coreutils coreutils coreutils-single
FileProvides: /usr/bin/locale glibc FileProvides: /usr/bin/locale glibc
FileProvides: /usr/bin/localedef glibc FileProvides: /usr/bin/localedef glibc
@ -828,6 +829,9 @@ Preinstall: libbz2-1 libgcc_s1 libncurses6 libreadline8 libz1 libselinux1
Preinstall: libgcrypt20 libgpg-error0 liblzma5 libcap2 libacl1 libattr1 Preinstall: libgcrypt20 libgpg-error0 liblzma5 libcap2 libacl1 libattr1
Preinstall: libpopt0 libelf1 libzstd1 libpcre2-8-0 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 #Runscripts: aaa_base
Prefer: libdb-4_8-devel Prefer: libdb-4_8-devel
@ -1356,6 +1360,9 @@ Prefer: -mbedtls-2-devel
# have choice for findutils-locate needed by catfish: mlocate plocate # have choice for findutils-locate needed by catfish: mlocate plocate
Prefer: -plocate Prefer: -plocate
# avoid choice libcurl-mini4 / libcurl4
Prefer: -libcurl-mini4
# hmac packages were merged into main, but still exist in Workbench # hmac packages were merged into main, but still exist in Workbench
Substitute: libfreebl3-hmac libfreebl3 Substitute: libfreebl3-hmac libfreebl3
Substitute: libsoftokn3-hmac libsoftokn3 Substitute: libsoftokn3-hmac libsoftokn3