Skip to content

Commit 4c47a22

Browse files
authored
config: sync Tumbleweed config (openSUSE#1008)
1 parent 958e355 commit 4c47a22

File tree

1 file changed

+20
-6
lines changed

1 file changed

+20
-6
lines changed

configs/tumbleweed.conf

+20-6
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ BuildFlags: genmetaalgo:1
77
# The prjconf macros have a serial to help work around issues like https://github.com/openSUSE/open-build-service/issues/4088
88
# On macros having impact on dep chains, update the serial (mainly ruby, python)
99
# Using a date to indicate when we set the serial
10-
ExpandFlags: macroserial:20240515
10+
ExpandFlags: macroserial:20240529
1111

1212
ExpandFlags: kiwi-nobasepackages
1313
ExpandFlags: docker-nobasepackages
@@ -379,6 +379,7 @@ FileProvides: /usr/bin/nmtui NetworkManager-tui
379379
FileProvides: /usr/bin/node nodejs-common
380380
FileProvides: /usr/bin/node20 nodejs20
381381
FileProvides: /usr/bin/node21 nodejs21
382+
FileProvides: /usr/bin/node22 nodejs22
382383
FileProvides: /usr/bin/nohup busybox-coreutils coreutils coreutils-single
383384
FileProvides: /usr/bin/nslookup bind-utils busybox-bind-utils
384385
FileProvides: /usr/bin/ocamlrun ocaml-runtime
@@ -494,13 +495,15 @@ FileProvides: /usr/bin/xmllint libxml2-tools
494495
FileProvides: /usr/bin/xsltproc libxslt-tools
495496
FileProvides: /usr/bin/xz busybox-xz xz
496497
FileProvides: /usr/bin/zcat busybox-gzip gzip zstd-gzip
498+
FileProvides: /usr/bin/zstd zstd
497499
FileProvides: /usr/sbin/a2enflag apache2
498500
FileProvides: /usr/sbin/a2enmod apache2
499501
FileProvides: /usr/sbin/agetty util-linux
500502
FileProvides: /usr/sbin/fonts-config fonts-config
501503
FileProvides: /usr/sbin/groupadd shadow
502504
FileProvides: /usr/sbin/groupdel shadow
503505
FileProvides: /usr/sbin/groupmod shadow
506+
FileProvides: /usr/sbin/iconvconfig glibc
504507
FileProvides: /usr/sbin/ipsec strongswan-ipsec
505508
FileProvides: /usr/sbin/ldconfig glibc
506509
FileProvides: /usr/sbin/lpadmin cups-client
@@ -516,7 +519,6 @@ FileProvides: /usr/sbin/useradd shadow
516519
FileProvides: /usr/sbin/userdel shadow
517520
FileProvides: /usr/sbin/usermod shadow
518521

519-
520522
# Files which are provided and required by the same package only
521523
# are not part of primary.xml.gz, thus missing in the section above.
522524
FileProvides: /usr/bin/Xvfb xorg-x11-server-Xvfb
@@ -554,6 +556,7 @@ Prefer: -busybox-procps -procps4
554556
Prefer: -busybox-psmisc
555557
Prefer: -busybox-sed
556558
Prefer: -busybox-tar
559+
Prefer: -busybox-unzip
557560
Prefer: -busybox-util-linux
558561
Prefer: -podman-docker
559562
# have choice for /usr/bin/dbus-launch needed by gnome-session-core: dbus-1 dbus-1-x11
@@ -783,6 +786,7 @@ Prefer: udev-mini
783786
# break dependency of the -mini packages: they are valid for OBS, but not for end-user-installation
784787
Ignore: cmake-mini:this-is-only-for-build-envs
785788
Ignore: dummy-release:this-is-only-for-build-envs
789+
Ignore: envsubst-mini:this-is-only-for-build-envs
786790
Ignore: erlang-rebar-obs:this-is-only-for-build-envs
787791
Ignore: ffmpeg-5-mini-devel:this-is-only-for-build-envs
788792
Ignore: ffmpeg-5-mini-libs:this-is-only-for-build-envs
@@ -795,6 +799,8 @@ Ignore: ghc-bootstrap:this-is-only-for-build-envs
795799
Ignore: ghostscript-mini:this-is-only-for-build-envs
796800
Ignore: harfbuzz-bootstrap:this-is-only-for-build-envs
797801
Ignore: jdk-bootstrap:this-is-only-for-build-envs
802+
Ignore: krb5-mini-devel:this-is-only-for-build-envs
803+
Ignore: krb5-mini:this-is-only-for-build-envs
798804
Ignore: libpxbackend-1_0-mini:this-is-only-for-build-envs
799805
Ignore: libsystemd0-mini:this-is-only-for-build-envs
800806
Ignore: libudev-mini1:this-is-only-for-build-envs
@@ -806,8 +812,6 @@ Ignore: postgresql16-devel-mini:this-is-only-for-build-envs
806812
Ignore: systemd-mini-container:this-is-only-for-build-envs
807813
Ignore: systemd-mini:this-is-only-for-build-envs
808814
Ignore: udev-mini:this-is-only-for-build-envs
809-
Ignore: krb5-mini-devel:this-is-only-for-build-envs
810-
Ignore: krb5-mini:this-is-only-for-build-envs
811815

812816
# Ring0 packages should not pull in 'info' - making the base VM smaller
813817
Ignore: autoconf:info
@@ -1422,11 +1426,16 @@ Prefer: -unzip-rcc
14221426
Prefer: -primus
14231427
Prefer: -staging-build-key
14241428
Prefer: -clutter-gst-devel
1429+
14251430
# We have multiple versions of ffmpeg available, the preferred one is ffmpeg5, followd by 4, followed by 3
14261431
%define ffmpeg_pref ffmpeg-6
14271432
Prefer: %{ffmpeg_pref}-mini-libs
14281433
Prefer: %{ffmpeg_pref}-mini-devel
14291434
Prefer: %{ffmpeg_pref} %{ffmpeg_pref}-libavcodec-devel %{ffmpeg_pref}-libavformat-devel %{ffmpeg_pref}-libavutil-devel %{ffmpeg_pref}-libswscale-devel %{ffmpeg_pref}-libavdevice-devel %{ffmpeg_pref}-libavfilter-devel
1435+
Macros:
1436+
%ffmpeg_pref ffmpeg-6
1437+
:Macros
1438+
14301439
# oxygen5-icon-theme osboletes oxygen-icon-theme
14311440
Prefer: oxygen5-icon-theme
14321441

@@ -1491,8 +1500,8 @@ Prefer: libsane1
14911500
Prefer: libglfw3
14921501
# have choice for (xclip or wl-clipboard) needed by password-store: wl-clipboard xclip
14931502
Prefer: -wl-clipboard
1494-
# have choice for pkgconfig(libhs): hyperscan-devel vectorscan-devel. hyperscan is for x86 only, prefer that where possible (for now).
1495-
Prefer: hyperscan-devel
1503+
# have choice for pkgconfig(libhs): hyperscan-devel vectorscan-devel. hyperscan is no longer free - de-prefer it
1504+
Prefer: -hyperscan-devel
14961505

14971506
Ignore: installation-images-openSUSE:cracklib-dict-full
14981507
Ignore: openSUSE-release:openSUSE-release-ftp,openSUSE-release-dvd5,openSUSE-release-biarch,openSUSE-release-livecdkde,openSUSE-release-livecdgnome
@@ -1804,6 +1813,7 @@ BuildFlags: onlybuild:dejavu-fonts
18041813
BuildFlags: onlybuild:deltarpm
18051814
BuildFlags: onlybuild:desktop-file-utils
18061815
BuildFlags: onlybuild:devscripts
1816+
BuildFlags: onlybuild:devscripts:checkbashisms
18071817
BuildFlags: onlybuild:dialog
18081818
BuildFlags: onlybuild:diffutils
18091819
BuildFlags: onlybuild:dirac
@@ -2378,6 +2388,7 @@ BuildFlags: onlybuild:nlohmann_json
23782388
BuildFlags: onlybuild:nodejs-common
23792389
BuildFlags: onlybuild:nodejs20
23802390
BuildFlags: onlybuild:nodejs21
2391+
BuildFlags: onlybuild:nodejs22
23812392
BuildFlags: onlybuild:npth
23822393
BuildFlags: onlybuild:nss-mdns
23832394
BuildFlags: onlybuild:numactl
@@ -2557,6 +2568,7 @@ BuildFlags: onlybuild:perl-Mock-Config
25572568
BuildFlags: onlybuild:perl-Module-Build
25582569
BuildFlags: onlybuild:perl-Module-Build-Tiny
25592570
BuildFlags: onlybuild:perl-Module-Implementation
2571+
BuildFlags: onlybuild:perl-Module-Pluggable
25602572
BuildFlags: onlybuild:perl-Module-Runtime
25612573
BuildFlags: onlybuild:perl-Mojo-DOM58
25622574
BuildFlags: onlybuild:perl-Moo
@@ -2975,6 +2987,7 @@ BuildFlags: onlybuild:qmlpluginexports:qt5
29752987
BuildFlags: onlybuild:qrencode
29762988
BuildFlags: onlybuild:qtdeclarative-imports-provides:qt5
29772989
BuildFlags: onlybuild:quota
2990+
BuildFlags: onlybuild:rapidjson
29782991
BuildFlags: onlybuild:raptor
29792992
BuildFlags: onlybuild:rav1e
29802993
BuildFlags: onlybuild:rdma-core
@@ -3012,6 +3025,7 @@ BuildFlags: onlybuild:rust1.74
30123025
BuildFlags: onlybuild:rust1.75
30133026
BuildFlags: onlybuild:rust1.76
30143027
BuildFlags: onlybuild:rust1.77
3028+
BuildFlags: onlybuild:rust1.78
30153029
BuildFlags: onlybuild:samba
30163030
BuildFlags: onlybuild:sane-backends
30173031
BuildFlags: onlybuild:sassc

0 commit comments

Comments
 (0)