@@ -11,7 +11,6 @@ ExpandFlags: macroserial:20240529
11
11
12
12
ExpandFlags: kiwi-nobasepackages
13
13
ExpandFlags: docker-nobasepackages
14
-
15
14
PublishFlags: ympdist:openSUSE%20Tumbleweed
16
15
17
16
# Use ext4 as FS in builder workers (instead of default ext3)
@@ -90,7 +89,7 @@ Macros:
90
89
91
90
%if "%_project" == "openSUSE:Factory" || "%_project" == "openSUSE:Factory:PowerPC" || "%_project" == "openSUSE:Factory:ARM" || "%_project" == "openSUSE:Factory:Rebuild" || "%_project" == "openSUSE:Factory:Live" || "%_project" == "openSUSE:Factory:NonFree" || "%_project" == "openSUSE:Factory:LegacyX86"
92
91
Substitute: kiwi-image:docker python3-kiwi kiwi-systemdeps-containers container-build-checks-vendor-openSUSE container-build-checks-strict
93
- Substitute: system-packages:docker kmod kernel-default docker createrepo_c container-build-checks-vendor-openSUSE container-build-checks-strict skopeo umoci
92
+ Substitute: system-packages:docker docker createrepo_c container-build-checks-vendor-openSUSE container-build-checks-strict skopeo umoci
94
93
Substitute: system-packages:podman podman buildah createrepo_c release-compare container-build-checks-vendor-openSUSE container-build-checks-strict skopeo umoci
95
94
%else
96
95
# That ignore seems not to make sense - we only inject -strict based on specific projects already
@@ -187,8 +186,6 @@ Prefer: liblua5_4-5 liblua5_3-5 liblua5_1-5
187
186
Prefer: %{lua_pref}-devel lua53-devel lua51-devel
188
187
Prefer: libtolua++-5_4-devel libtolua++-5_3-devel libtolua++-5_1-devel
189
188
190
- Preinstall: liblua5_4-5
191
-
192
189
ExpandFlags: keepfilerequires
193
190
194
191
# Generated by openSUSE-release-tools/repo2fileprovides.py
@@ -575,9 +572,6 @@ Prefer: -cni-plugins -cni
575
572
# have choice for suse-kernel-rpm-scriptlets: sdbootutil-rpm-scriptlets suse-module-tools-scriptlets
576
573
Prefer: -sdbootutil-rpm-scriptlets
577
574
578
- # have choice for chromedriver needed by openQA-devel: chromedriver ungoogled-chromium-chromedriver
579
- Prefer: -ungoogled-chromium-chromedriver
580
-
581
575
# have choice for pkgconfig(libmarkdown): libmarkdown-devel libmarkdown2-devel
582
576
Prefer: -libmarkdown2-devel
583
577
@@ -624,19 +618,23 @@ Prefer: -freerdp-devel
624
618
# have choice for registries-conf >= 20240408 needed by libcontainers-common: registries-conf-default registries-conf-suse
625
619
Prefer: -registries-conf-suse
626
620
627
- #---
621
+ # have choice for cmake(cmocka): libcmocka-cmake libcmocka-cmake-32bit
622
+ Prefer: -libcmocka-cmake-32bit
628
623
629
- Preinstall: aaa_base filesystem attr bash bash-sh coreutils diffutils
630
- Preinstall: fillup glibc grep pam permissions rpm rpm-config-SUSE sed tar
631
- Preinstall: libbz2-1 libgcc_s1 libncurses6 libreadline8 libz1 libselinux1
632
- Preinstall: libgcrypt20 libgpg-error0 liblzma5 libcap2 libacl1 libattr1
633
- Preinstall: libpopt0 libelf1 libzstd1 libpcre2-8-0
624
+ #have choice for libcurl.so.4()(64bit) needed by cargo1.79: libcurl-mini4 libcurl4
625
+ Prefer: -libcurl-mini4
634
626
635
- #Runscripts: aaa_base
627
+ #---
636
628
637
- Prefer: libdb-4_8-devel
638
- VMinstall: util-linux libmount1 libeconf0 perl-base libdb-4_8 libblkid1 libuuid1 libsmartcols1 libcrypt1
629
+ ExpandFlags: preinstallexpand
630
+ Preinstall: rpm
631
+
632
+ VMinstall: perl-base
633
+ VMinstall: util-linux
634
+ # bootstrap-copy is an aggregate-only repository, no VMs are built up
635
+ %if "%_repository" != "bootstrap_copy"
639
636
VMinstall: kernel-obs-build
637
+ %endif
640
638
641
639
# Use the x86_64 kernel on i586 builds - boo#1178762 - Slow down in OBS since kernel 5.6.0 on 32bit
642
640
ExportFilter: ^kernel-obs-build.*\.x86_64.rpm$ . i586
@@ -751,7 +749,6 @@ Prefer: lightdm-gtk-greeter:lightdm-gtk-greeter-branding-upstream
751
749
Prefer: mate-desktop-gschemas:mate-desktop-gschemas-branding-upstream
752
750
Prefer: NetworkManager:NetworkManager-branding-openSUSE
753
751
Prefer: PackageKit:PackageKit-branding-upstream
754
- Prefer: sddm:sddm-branding-upstream
755
752
Prefer: sway:sway-branding-upstream
756
753
Prefer: systemd-presets-branding-openSUSE
757
754
Prefer: wallpaper-branding-openSUSE
@@ -872,8 +869,6 @@ Conflict: systemd-mini-devel:systemd
872
869
# Cmake exists as a -mini flavor, which is not linked against curl.
873
870
Prefer: cmake-mini
874
871
875
- Prefer: -re2-10-devel
876
-
877
872
# python-pip inside OBS never connects to the net, so we don't use certs
878
873
Ignore: python310-pip:ca-certificates
879
874
Ignore: python311-pip:ca-certificates
@@ -953,7 +948,6 @@ Prefer: -libpxbackend-1_0
953
948
Prefer: -scout-command-not-found
954
949
955
950
# have choice for kubernetes-kubelet-common (de-prefer the old versions, ensuring to have a new unresolvable when a new version shows up)
956
- Prefer: -kubernetes1.20-kubelet-common -kubernetes1.21-kubelet-common -kubernetes1.22-kubelet-common -kubernetes1.23-client-common
957
951
Prefer: -kubernetes1.24-client-common -kubernetes1.25-client-common
958
952
959
953
# have choice for cmake(KWinDBusInterface) >= MACRO: deepin-kwin-devel kwin5-devel
@@ -1022,9 +1016,6 @@ Prefer: -python310-jupyterlab
1022
1016
Prefer: -python310-nbclassic -python312-nbclassic
1023
1017
prefer: -python310-notebook -python312-notebook
1024
1018
1025
- # have choice for container:opensuse/nginx:latest: container:opensuse-nginx-1.25 container:opensuse-nginx-image
1026
- Prefer: -container:opensuse-nginx-1.25
1027
-
1028
1019
# have choice for (sysvinit(network) or service(network)) needed by sysconfig: NetworkManager wicked-service
1029
1020
Prefer: -NetworkManager
1030
1021
@@ -1041,7 +1032,7 @@ Prefer: nodejs-default nodejs-devel-default npm-default
1041
1032
Prefer: -libhs5-vectorscan5
1042
1033
1043
1034
# have choice for libpulse.so.0 needed by wine-32bit: apulse-32bit libpulse0-32bit - prefering the 'original'
1044
- Prefer: libpulse0-32bit libsane1-32bit - pipewire-pulseaudio
1035
+ Prefer: libpulse0-32bit libsane1-32bit pipewire-pulseaudio
1045
1036
1046
1037
# Have choice for vtk-java/vtk-tcl/python3-vtk needed by vtk-devel
1047
1038
Prefer: vtk-java
@@ -1500,8 +1491,6 @@ Prefer: libsane1
1500
1491
Prefer: libglfw3
1501
1492
# have choice for (xclip or wl-clipboard) needed by password-store: wl-clipboard xclip
1502
1493
Prefer: -wl-clipboard
1503
- # have choice for pkgconfig(libhs): hyperscan-devel vectorscan-devel. hyperscan is no longer free - de-prefer it
1504
- Prefer: -hyperscan-devel
1505
1494
1506
1495
Ignore: installation-images-openSUSE:cracklib-dict-full
1507
1496
Ignore: openSUSE-release:openSUSE-release-ftp,openSUSE-release-dvd5,openSUSE-release-biarch,openSUSE-release-livecdkde,openSUSE-release-livecdgnome
@@ -1814,6 +1803,7 @@ BuildFlags: onlybuild:deltarpm
1814
1803
BuildFlags: onlybuild:desktop-file-utils
1815
1804
BuildFlags: onlybuild:devscripts
1816
1805
BuildFlags: onlybuild:devscripts:checkbashisms
1806
+ BuildFlags: onlybuild:dhcp
1817
1807
BuildFlags: onlybuild:dialog
1818
1808
BuildFlags: onlybuild:diffutils
1819
1809
BuildFlags: onlybuild:dirac
@@ -2039,6 +2029,7 @@ BuildFlags: onlybuild:kmod
2039
2029
BuildFlags: onlybuild:knotifications
2040
2030
BuildFlags: onlybuild:krb5
2041
2031
BuildFlags: onlybuild:krb5:krb5-mini
2032
+ BuildFlags: onlybuild:kronosnet
2042
2033
BuildFlags: onlybuild:kservice
2043
2034
BuildFlags: onlybuild:kwallet
2044
2035
BuildFlags: onlybuild:kwidgetsaddons
@@ -2618,6 +2609,7 @@ BuildFlags: onlybuild:perl-Syntax-Keyword-Try
2618
2609
BuildFlags: onlybuild:perl-Term-ReadKey
2619
2610
BuildFlags: onlybuild:perl-Term-Table
2620
2611
BuildFlags: onlybuild:perl-Test-Base
2612
+ BuildFlags: onlybuild:perl-Test-Cmd
2621
2613
BuildFlags: onlybuild:perl-Test-CPAN-Meta
2622
2614
BuildFlags: onlybuild:perl-Test-Deep
2623
2615
BuildFlags: onlybuild:perl-Test-Differences
@@ -3020,12 +3012,13 @@ BuildFlags: onlybuild:rubygem-rdiscount
3020
3012
BuildFlags: onlybuild:rubygem-ronn
3021
3013
BuildFlags: onlybuild:rust
3022
3014
BuildFlags: onlybuild:rust-bindgen
3023
- BuildFlags: onlybuild:rust1.73
3015
+ BuildFlags: onlybuild:rust-cbindgen
3024
3016
BuildFlags: onlybuild:rust1.74
3025
3017
BuildFlags: onlybuild:rust1.75
3026
3018
BuildFlags: onlybuild:rust1.76
3027
3019
BuildFlags: onlybuild:rust1.77
3028
3020
BuildFlags: onlybuild:rust1.78
3021
+ BuildFlags: onlybuild:rust1.79
3029
3022
BuildFlags: onlybuild:samba
3030
3023
BuildFlags: onlybuild:sane-backends
3031
3024
BuildFlags: onlybuild:sassc
@@ -3155,6 +3148,7 @@ BuildFlags: onlybuild:tpm2-0-tss
3155
3148
BuildFlags: onlybuild:tracker
3156
3149
BuildFlags: onlybuild:transfig
3157
3150
BuildFlags: onlybuild:translation-update-upstream
3151
+ BuildFlags: onlybuild:tree
3158
3152
BuildFlags: onlybuild:tslib
3159
3153
BuildFlags: onlybuild:ttf-converter
3160
3154
BuildFlags: onlybuild:twolame
0 commit comments