diff --git a/_attribute b/_attribute index bc73ee4..4f4b338 100644 --- a/_attribute +++ b/_attribute @@ -4,10 +4,10 @@ last_seen: - boo#1094987: '20220809' - boo#1172073: '20220614' - boo#1183454: '20220809' - boo#1190434: '20220809' + boo#1094987: '20221008' + boo#1172073: '20220918' + boo#1183454: '20221020' + boo#1190434: '20221020' boo#1190823: '20220409' boo#1196201: '20220525' boo#1196335: '20220524' @@ -20,7 +20,7 @@ boo#1197521: '20220403' boo#1197638: '20220404' boo#1197704: '20220517' - boo#1197719: '20220809' + boo#1197719: '20221020' boo#1197931: '20220412' boo#1198150: '20220421' boo#1198169: '20220413' @@ -29,22 +29,22 @@ boo#1198418: '20220518' boo#1199498: '20220512' boo#1199535: '20220516' - boo#1199881: '20220809' + boo#1199881: '20221020' boo#1199885: '20220606' boo#1199924: '20220601' boo#1199925: '20220601' - boo#1200275: '20220809' + boo#1200275: '20220820' boo#1200403: '20220809' boo#1200595: '20220614' boo#1200600: '20220614' - boo#1200615: '20220809' - boo#1200616: '20220809' + boo#1200615: '20220812' + boo#1200616: '20220814' boo#1200682: '20220628' boo#1200753: '20220726' boo#1200893: '20220718' - boo#1200894: '20220809' + boo#1200894: '20221020' boo#1201054: '20220711' - boo#1201057: '20220809' + boo#1201057: '20221015' boo#1201082: '20220711' boo#1201348: '20220714' boo#1201349: '20220719' @@ -52,14 +52,36 @@ boo#1201538: '20220722' boo#1201931: '20220726' boo#1202000: '20220804' - boo#1202161: '20220808' - bsc#1161276: '20220809' - bsc#1191684: '20220808' - bsc#1198101: '20220809' + boo#1202161: '20220810' + boo#1202330: '20221019' + boo#1202460: '20220910' + boo#1202495: '20220907' + boo#1202497: '20220827' + boo#1202569: '20220819' + boo#1202849: '20220828' + boo#1203082: '20220921' + boo#1203148: '20220905' + boo#1203501: '20220925' + boo#1203644: '20220929' + boo#1203691: '20221004' + boo#1203696: '20221001' + boo#1203900: '20220929' + boo#1203956: '20221008' + boo#1204134: '20221008' + boo#1204279: '20221020' + boo#1204410: '20221018' + boo#1204477: '20221019' + boo#12345: '20221004' + bsc#1161276: '20221020' + bsc#1191684: '20220827' + bsc#1198101: '20221020' bsc#1198235: '20220503' + bsc#1204279: '20221020' gh#os-autoinst/opensuse-jobgroups#180: '20220728' - gh#os-autoinst/opensuse-jobgroups#183: '20220809' + gh#os-autoinst/opensuse-jobgroups#183: '20220906' gh#os-autoinst/os-autoinst-distri-opensuse#15257: '20220719' + gh#os-autoinst/os-autoinst-distri-opensuse#15662: '20221010' + gh#virt-manager/virt-manager#426: '20221020' poo#105295: '20220518' poo#106676: '20220412' poo#107893: '20220419' @@ -78,7 +100,7 @@ poo#110872: '20220517' poo#111036: '20220612' poo#111069: '20220530' - poo#111266: '20220808' + poo#111266: '20220814' poo#111416: '20220525' poo#111479: '20220622' poo#111485: '20220523' @@ -89,20 +111,44 @@ poo#112241: '20220608' poo#112244: '20220608' poo#112580: '20220625' - poo#112649: '20220809' + poo#112649: '20221011' poo#112700: '20220622' poo#112982: '20220623' poo#113051: '20220703' - poo#113075: '20220809' + poo#113075: '20221020' poo#113114: '20220628' poo#113360: '20220712' - poo#113492: '20220809' + poo#113492: '20221020' poo#113549: '20220713' poo#114923: '20220809' poo#114986: '20220804' - poo#115115: '20220809' - poo#115133: '20220808' - poo#63397: '20220422' + poo#115115: '20220817' + poo#115133: '20221018' + poo#115274: '20221003' + poo#115313: '20220816' + poo#115364: '20220822' + poo#115385: '20220822' + poo#115388: '20220911' + poo#115421: '20220919' + poo#115694: '20221020' + poo#116048: '20220830' + poo#116161: '20220904' + poo#116704: '20221010' + poo#116914: '20221008' + poo#116917: '20221001' + poo#117031: '20221020' + poo#117034: '20221020' + poo#117154: '20221020' + poo#117214: '20220926' + poo#117331: '20221020' + poo#117457: '20220929' + poo#117499: '20221008' + poo#117559: '20221013' + poo#117643: '20221006' + poo#117688: '20221012' + poo#118888: '20221020' + poo#63397: '20220921' + poo#80628: '20221020' poo#99312: '20220502' @@ -113,8 +159,8 @@ splitter-whitelist = # now just for testing source_projects_expand = devel:languages:haskell -# YaST:Head:D-Installer init - rbrown 29 Jul 2022 -devel-whitelist = YaST:Head:D-Installer +# devel:microos:containers init - rbrown 10 Aug 2022 +devel-whitelist = devel:microos:containers # packagelist generator related configuration pkglistgen-archs = i586 x86_64 @@ -146,11 +192,11 @@ rebuildpacs-leafs = branding-openSUSE PackageKit-branding-openSUSE xfce4-brandin s/openSUSE-/openSUSE-Staging:$LETTER-/ - 20220809 + 20221021 arch: x86_64 -jobs_num: 321 +jobs_num: 312 openqa_group: openSUSE Tumbleweed openqa_server: https://openqa.opensuse.org product_repo: images @@ -231,8 +277,6 @@ products: - x86_64 - opensuse-bind-image: - x86_64 - - opensuse-cockpit-ws-image: - - x86_64 - opensuse-dhcp-server-image: - x86_64 - opensuse-docker_auth-image: @@ -276,6 +320,7 @@ products: # - opensuse-tensorflow2-image: # - x86_64 - opensuse-toolbox-image: + - i586 - x86_64 - opensuse-tumbleweed-image:docker: - i586 @@ -319,6 +364,9 @@ products: - x86_64 - cdi-uploadserver-container: - x86_64 + - cups-image: + - i586 + - x86_64 - go1.16-devel-container: - i586 - x86_64 @@ -337,6 +385,8 @@ products: - java15-devel-container: - i586 - x86_64 + - microos-docserv-image: + - x86_64 - opensuse-memcached-image: - i586 - x86_64 @@ -469,9 +519,9 @@ set_snapshot_number: True failed: '' -published: '20220808' -publishing: '20220808' -testing: '20220809' +published: '20221020' +publishing: '20221020' +testing: '20221020' diff --git a/_config b/_config index c63ca08..e5993f5 100644 --- a/_config +++ b/_config @@ -7,7 +7,7 @@ BuildFlags: genmetaalgo:1 # The prjconf macros have a serial to help work around issues like https://github.com/openSUSE/open-build-service/issues/4088 # On macros having impact on dep chains, update the serial (mainly ruby, python) # Using a date to indicate when we set the serial -ExpandFlags: macroserial:20220614 +ExpandFlags: macroserial:20221005 ExpandFlags: kiwi-nobasepackages ExpandFlags: docker-nobasepackages @@ -28,7 +28,6 @@ Patterntype: rpm-md ymp Repotype: none Patterntype: none Prefer: openSUSE-release-ftp - Prefer: -postgresql14-devel-mini Support: release-compare BuildFlags: obsgendiff %endif @@ -65,7 +64,8 @@ Macros: BuildFlags: logidlelimit:5400 %endif -%if "%_project" == "openSUSE:Factory" || "%_project" == "openSUSE:Factory:NonFree" || "%_project" == "openSUSE:Factory:PowerPC" || "%_project" == "openSUSE:Factory:ARM" || "%_project" == "openSUSE:Factory:Live" || "%_project" == "openSUSE:Factory:Rebuild" || "%_project" == "openSUSE:Factory:Rings" || "%_project" == "openSUSE:Factory:Rings:0-Bootstrap" || "%_project" == "openSUSE:Factory:Rings:1-MinimalX" || "%_project" == "openSUSE:Factory:Rings:2-TestDVD" || "%_project" == "openSUSE:Factory:Containers" +%if "%_project" == "openSUSE:Factory" || "%_project" == "openSUSE:Factory:NonFree" || "%_project" == "openSUSE:Factory:PowerPC" || "%_project" == "openSUSE:Factory:ARM" || "%_project" == "openSUSE:Factory:Live" || "%_project" == "openSUSE:Factory:Rebuild" || "%_project" == "openSUSE:Factory:Rings" || "%_project" == "openSUSE:Factory:Rings:0-Bootstrap" || "%_project" == "openSUSE:Factory:Rings:1-MinimalX" || "%_project" == "openSUSE:Factory:Containers" || "%_project" == "openSUSE:Factory:RISCV" || "%_project" == "openSUSE:Factory:zSystems" +BuildFlags: excludebuild:openh264 Macros: %vendor openSUSE %distribution openSUSE Tumbleweed @@ -107,13 +107,13 @@ Substitute: kiwi-packagemanager:instsource product-builder-plugin-Tumbleweed Substitute: system-packages:kiwi-product product-builder # allow builds using docker tool -Substitute: build-packages:docker !cmake-mini !dummy-release !gettext-runtime-mini !gettext-tools-mini !ghostscript-mini !gio-branding-upstream !krb5-mini !krb5-mini-devel !libsystemd0-mini !systemd-mini-container !libudev-mini-devel !libudev-mini1 !libuna-mini-devel !libuna1-mini !libunbound-devel-mini !postgresql14-devel-mini !systemd-mini !systemd-mini-devel !systemd-mini-sysvinit !udev-mini patterns-base-fips +Substitute: build-packages:docker !cmake-mini !dummy-release !gettext-runtime-mini !gettext-tools-mini !ghostscript-mini !gio-branding-upstream !krb5-mini !krb5-mini-devel !libsystemd0-mini !systemd-mini-container !libudev-mini-devel !libudev-mini1 !libuna-mini-devel !libuna1-mini !libunbound-devel-mini !postgresql15-devel-mini !systemd-mini !systemd-mini-devel !systemd-mini-sysvinit !udev-mini patterns-base-fips # Podman based image building -Substitute: build-packages:kiwi !cmake-mini !dummy-release !gettext-runtime-mini !gettext-tools-mini !ghostscript-mini !gio-branding-upstream !krb5-mini !krb5-mini-devel !libsystemd0-mini !systemd-mini-container !libudev-mini-devel !libudev-mini1 !libuna-mini-devel !libuna1-mini !libunbound-devel-mini !log4j12-mini !postgresql14-devel-mini !systemd-mini !systemd-mini-devel !systemd-mini-sysvinit !udev-mini patterns-base-fips +Substitute: build-packages:kiwi !cmake-mini !dummy-release !gettext-runtime-mini !gettext-tools-mini !ghostscript-mini !gio-branding-upstream !krb5-mini !krb5-mini-devel !libsystemd0-mini !systemd-mini-container !libudev-mini-devel !libudev-mini1 !libuna-mini-devel !libuna1-mini !libunbound-devel-mini !log4j12-mini !postgresql15-devel-mini !systemd-mini !systemd-mini-devel !systemd-mini-sysvinit !udev-mini patterns-base-fips # To build ISO images -Substitute: build-packages:iso !cmake-mini !dummy-release !gettext-runtime-mini !gettext-tools-mini !ghostscript-mini !gio-branding-upstream !krb5-mini !krb5-mini-devel !libsystemd0-mini !systemd-mini-container !libudev-mini-devel !libudev-mini1 !libuna-mini-devel !libuna1-mini !libunbound-devel-mini !log4j12-mini !postgresql14-devel-mini !systemd-mini !systemd-mini-devel !systemd-mini-sysvinit !udev-mini +Substitute: build-packages:iso !cmake-mini !dummy-release !gettext-runtime-mini !gettext-tools-mini !ghostscript-mini !gio-branding-upstream !krb5-mini !krb5-mini-devel !libsystemd0-mini !systemd-mini-container !libudev-mini-devel !libudev-mini1 !libuna-mini-devel !libuna1-mini !libunbound-devel-mini !log4j12-mini !postgresql15-devel-mini !systemd-mini !systemd-mini-devel !systemd-mini-sysvinit !udev-mini # create conflicts for packages installed into the target image Substitute: kiwi python3-kiwi @@ -124,7 +124,8 @@ Prefer: installation-images-openSUSE installation-images-debuginfodeps-openSUSE # Since not all packages care, we only add it where needed (instead of preinstall) Substitute: netcfg netcfg libnss_usrfiles2 -%ifnarch armv6l +# fvogt 2022-10-11: Let's try this again. +#%ifnarch armv6l # Not enabled for armv6l, due to https://bugzilla.opensuse.org/show_bug.cgi?id=1193317 # Enable ccache for a selection of packages: BuildFlags: useccache:NetworkManager @@ -134,19 +135,10 @@ Substitute: netcfg netcfg libnss_usrfiles2 BuildFlags: useccache:gtk3 BuildFlags: useccache:llvm9 BuildFlags: useccache:nodejs-electron - buildflags: useccache:tensorflow - buildflags: useccache:tensorflow2:hpc - buildflags: useccache:tensorflow2:hpc-openmpi2 - buildflags: useccache:tensorflow2:lite - buildflags: useccache:tensorflow2:standard - buildflags: useccache:tensorflow:hpc - buildflags: useccache:tensorflow:hpc-openmpi2 - buildflags: useccache:tensorflow:lite - buildflags: useccache:tensorflow:standard BuildFlags: useccache:webkit2gtk3:gtk3 BuildFlags: useccache:webkit2gtk3:gtk3-soup2 BuildFlags: useccache:webkit2gtk3:gtk4 -%endif +#%endif # slsaprovenance - as described at https://slsa.dev/provenance/v0.2 # slsaprovenance diabled on Apr 28 2022 @@ -192,6 +184,9 @@ FileProvides: /usr/bin/fusermount3 fuse3 FileProvides: /usr/bin/grep busybox-grep grep FileProvides: /usr/bin/gzip busybox-gzip gzip zstd-gzip Prefer: gzip +FileProvides: /usr/bin/bzip2 busybox-bzip2 bzip2 +Prefer: bzip2 +FileProvides: /usr/bin/lzop lzop FileProvides: /usr/bin/killall psmisc FileProvides: /usr/bin/mkdir coreutils busybox-coreutils FileProvides: /usr/bin/mimencode metamail @@ -233,7 +228,7 @@ Preinstall: aaa_base filesystem attr bash bash-sh coreutils diffutils Preinstall: fillup glibc grep pam permissions rpm rpm-config-SUSE sed tar Preinstall: libbz2-1 libgcc_s1 libncurses6 libreadline8 libz1 libselinux1 Preinstall: libgcrypt20 libgpg-error0 liblzma5 libcap2 libacl1 libattr1 -Preinstall: libpopt0 libelf1 libpcre1 libzstd1 libpcre2-8-0 +Preinstall: libpopt0 libelf1 libzstd1 libpcre2-8-0 #Runscripts: aaa_base @@ -402,6 +397,7 @@ Ignore: libunbound-devel-mini:this-is-only-for-build-envs Ignore: postgresql12-devel-mini:this-is-only-for-build-envs Ignore: postgresql13-devel-mini:this-is-only-for-build-envs Ignore: postgresql14-devel-mini:this-is-only-for-build-envs +Ignore: postgresql15-devel-mini:this-is-only-for-build-envs Ignore: systemd-mini:this-is-only-for-build-envs Ignore: systemd-mini-container:this-is-only-for-build-envs Ignore: udev-mini:this-is-only-for-build-envs @@ -469,6 +465,9 @@ Prefer: -cyrus-sasl-bdb-devel # Spamassassin requires wget or curl - we prefer curl, as its build dep chain seems cheaper Prefer: spamassassin:curl +# have choice for pkgconfig(catch2): Catch2-2-devel Catch2-devel +Prefer: -Catch2-2-devel + # Python3 exists in multiple versions - we currently favor 3.8 (our default): Prefer: -python39 Prefer: -python39-hotdoc @@ -477,8 +476,11 @@ Prefer: -python39-txt2tags -python310-txt2tags # have choice for python3-magic: python38-magic python38-python-magic Prefer: -python38-magic -python39-magic -python310-magic +# have choice for gcr-ssh-agent needed by libgcr-3-1: gcr-ssh-agent gcr3-ssh-agent +Prefer: -gcr3-ssh-agent -gcr3-viewer + # have choice for (python36-qt5 or python36-PyQt6) needed by python36-pytest-qt -Prefer: -python39-PyQt6 -python38-PyQt6 -python3-pyside2 +Prefer: -python310-PyQt6 -python39-PyQt6 -python38-PyQt6 -python3-pyside2 # man and mandoc provide man; mandoc claims to be lightweight, but it was never discussed to be the new default Prefer: man @@ -489,7 +491,7 @@ Prefer: go -go1.13 Prefer: kernel-default-base # have choice for kubernetes-kubelet-common (de-prefer the old versions, ensuring to have a new unresolvable when a new version shows up) -Prefer: -kubernetes1.18-kubelet-common -kubernetes1.19-kubelet-common -kubernetes1.20-kubelet-common -kubernetes1.21-kubelet-common -kubernetes1.22-kubelet-common -kubernetes1.23-client-common +Prefer: -kubernetes1.20-kubelet-common -kubernetes1.21-kubelet-common -kubernetes1.22-kubelet-common -kubernetes1.23-client-common # have choice for html2text Prefer: -python38-html2text -python39-html2text -python310-html2text @@ -510,9 +512,6 @@ Prefer: PackageKit-backend-zypp # have choice for pkgconfig(libftdi): libftdi-devel libftdi0-devel Prefer: libftdi-devel -# have choice for tensorflow: tensorflow tensorflow2 tensorflow2_2_1_0-gnu-hpc tensorflow2_2_1_0-gnu-mvapich2-hpc tensorflow2_2_1_0-gnu-openmpi2-hpc -Prefer: tensorflow2 - # have choice for python3-sip: python3-sip-devel python3-sip4 Prefer: python38-sip-devel python39-sip-devel python310-sip-devel Prefer: -python38-sip4 -python38-sip4-devel @@ -524,6 +523,9 @@ Prefer: python310-Shapely:geos # pipewire has a jack compatible implementation - but for now we prefer the real jack Prefer: -pipewire-libjack-0_3-devel libjack0 +# have choice for python3-zeep >= 3.2.0: python310-softlayer-zeep python310-zeep +Prefer: -python310-softlayer-zeep + # There is python[23]-prompt_toolkit and also python3-prompt_toolkit1 for compat. Use the unversioned one by default Prefer: python39-prompt_toolkit python38-prompt_toolkit python310-prompt_toolkit @@ -580,6 +582,12 @@ Prefer: -nunit3-devel # Pick the regular libz.so.1 Prefer: -libz-ng-compat1 -zlib-ng-compat-devel -libz-ng-compat1-32bit +# have choice for (distrobox if patterns-microos-desktop-common else toolbox) needed by patterns-containers-container_runtime: patterns-microos-desktop-common toolbox +Prefer: -patterns-microos-desktop-common + +# unresolvable: have choice for libomp.so()(64bit) needed by libispcrt_1: libomp11-devel libomp12-devel libomp13-devel libomp14-devel libomp15-devel, have choice for libomp.so(VERSION)(64bit) needed by libispcrt_1: libomp11-devel libomp12-devel libomp13-devel libomp14-devel libomp15-devel +Prefer: -libomp11-devel -libomp12-devel -libomp13-devel -libomp14-devel + # 32bit -devel packages contain .pc files and cause a 'have choice' for OBS. unfavor the -32bit variants Prefer: -ColPack-devel-32bit Prefer: -FAudio-devel-32bit @@ -598,7 +606,6 @@ Prefer: -alsa-topology-devel-32bit Prefer: -armadillo-devel-32bit Prefer: -arpack-ng-devel-32bit Prefer: -at-spi2-core-devel-32bit -Prefer: -atk-devel-32bit Prefer: -atkmm-devel-32bit Prefer: -atkmm1_6-devel-32bit Prefer: -audiofile-devel-32bit @@ -612,9 +619,6 @@ Prefer: -cairomm-devel-32bit Prefer: -cairomm1_0-devel-32bit Prefer: -cblas-devel-32bit Prefer: -chmlib-devel-32bit -Prefer: -clang10-devel-32bit -Prefer: -clang7-devel-32bit -Prefer: -clang9-devel-32bit Prefer: -cppunit-devel-32bit Prefer: -cracklib-devel-32bit Prefer: -cups-devel-32bit @@ -660,7 +664,6 @@ Prefer: -krb5-devel-32bit Prefer: -lapack-devel-32bit Prefer: -lapacke-devel-32bit Prefer: -libFS-devel-32bit -Prefer: -libGLw-devel-32bit Prefer: -libHX-devel-32bit Prefer: -libICE-devel-32bit Prefer: -libMagick++-devel-32bit @@ -677,15 +680,8 @@ Prefer: -libQt5Sql-devel-32bit Prefer: -libQt5Test-devel-32bit Prefer: -libQt5Widgets-devel-32bit Prefer: -libQt5Xml-devel-32bit -Prefer: -libSDL-devel-32bit -Prefer: -SDL-devel-32bit -Prefer: -libSDL2-devel-32bit +Prefer: -SDL2-devel-32bit Prefer: -libSDL2_gfx-devel-32bit -Prefer: -libSDL2_image-devel-32bit -Prefer: -libSDL2_mixer-devel-32bit -Prefer: -libSDL2_net-devel-32bit -Prefer: -libSDL2_ttf-devel-32bit -Prefer: -libSDL_Pango-devel-32bit Prefer: -libSDL_gfx-devel-32bit Prefer: -libSDL_image-devel-32bit Prefer: -libSDL_mixer-devel-32bit @@ -693,7 +689,6 @@ Prefer: -libSDL_mixer-devel-64bit Prefer: -libSDL_net-devel-32bit Prefer: -libSDL_ttf-devel-32bit Prefer: -libSDL_ttf-devel-64bit -Prefer: -libSDLmm-devel-32bit Prefer: -libSM-devel-32bit Prefer: -libX11-devel-32bit Prefer: -libXau-devel-32bit @@ -765,7 +760,6 @@ Prefer: -libgbm-devel-32bit Prefer: -libgck-devel-32bit Prefer: -libgcr-devel-32bit Prefer: -libgcrypt-devel-32bit -Prefer: -libglue-devel-32bit Prefer: -libglvnd-devel-32bit Prefer: -libgnutls-devel-32bit Prefer: -libgpg-error-devel-32bit @@ -778,7 +772,6 @@ Prefer: -libjack-devel-32bit Prefer: -libjbig-devel-32bit Prefer: -libjpeg62-devel-32bit Prefer: -libjpeg8-devel-32bit -Prefer: -libkms-devel-32bit Prefer: -liblbxutil-devel-32bit Prefer: -liblcms2-devel-32bit Prefer: -libmount-devel-32bit @@ -844,7 +837,6 @@ Prefer: -libvdpau-devel-32bit Prefer: -libverto-devel-32bit Prefer: -libvirt-devel-32bit Prefer: -libvorbis-devel-32bit -Prefer: -libvpd2-devel-32bit Prefer: -libwebp-devel-32bit Prefer: -libxcb-devel-32bit Prefer: -libxcrypt-devel-32bit @@ -856,12 +848,6 @@ Prefer: -libxml2-devel-32bit Prefer: -libxslt-devel-32bit Prefer: -libyajl-devel-32bit Prefer: -libzstd-devel-32bit -Prefer: -llvm10-LTO-devel-32bit -Prefer: -llvm10-devel-32bit -Prefer: -llvm7-LTO-devel-32bit -Prefer: -llvm7-devel-32bit -Prefer: -llvm9-LTO-devel-32bit -Prefer: -llvm9-devel-32bit Prefer: -lzo-devel-32bit Prefer: -motif-devel-32bit Prefer: -mpc-devel-32bit @@ -915,6 +901,7 @@ Prefer: -zziplib-devel-32bit # Ruby stuff - quite a few packages exist in multiple versions in the distro; in each case, the Preference is on the 'unversioned' package Prefer: ruby3.1-rubygem-fast_gettext +Prefer: -ruby3.1-rubygem-public_suffix-3.1 # We have opencv and opencv3 - as usual, the unversioned one should win Prefer: opencv-devel @@ -979,10 +966,12 @@ Prefer: vala # in doubt, take higher versions Prefer: geronimo-servlet-2_4-api Prefer: libhdf5_hl100 -libhdf5-103-openmpi1 -libhdf5-103-mvapich2 -libhdf5_cpp103-openmpi1 -libhdf5_cpp103-mvapich2 -libhdf5-103-openmpi2 -libhdf5-103-openmpi3 -libhdf5-103-openmpi4 -libhdf5_cpp103-openmpi2 -libhdf5_cpp103-openmpi3 -libhdf5_cpp103-openmpi4 +Prefer: libhdf5_hl200 -libhdf5-200-openmpi1 -libhdf5-200-mvapich2 -libhdf5_cpp200-openmpi1 -libhdf5_cpp200-mvapich2 -libhdf5-200-openmpi2 -libhdf5-200-openmpi3 -libhdf5-200-openmpi4 -libhdf5_cpp200-openmpi2 -libhdf5_cpp200-openmpi3 -libhdf5_cpp200-openmpi4 Prefer: libvtk1-openmpi2 Prefer: -vtk-openmpi2-qt -vtk-openmpi3-qt Prefer: -openmpi3-libs Prefer: -openmpi3-config -openmpi2-config -openmpi1-config +Prefer: -openmpi5-config Prefer: fftw3-devel ImageMagick-config-7-SUSE # prefer the small systemd for building Prefer: star @@ -990,7 +979,7 @@ Prefer: xmlgraphics-commons:apache-commons-io # the -32bit stuff provides things it shouldn't (hopefully temporary) Prefer: -glib2-devel-32bit -typelib-1_0-Gst-1_0-32bit Prefer: postgresql postgresql-server postgresql-devel postgresql-server-devel -Prefer: postgresql14-devel-mini +Prefer: postgresql15-devel-mini # only needed to bootstrap 11, but leave it - 12 will come at some point :) Prefer: -unzip-rcc Prefer: -primus -primus-32bit @@ -1035,7 +1024,7 @@ Prefer: gnome-keyring-32bit Prefer: linux-glibc-devel Prefer: squid Prefer: libpng16-compat-devel -Prefer: -python -python3-gobject2-devel -libpng12-0 +Prefer: -python -libpng12-0 Prefer: perl-Mail-SPF:perl-Error Prefer: -xml-commons-apis-bootstrap -xml-commons-resolver-bootstrap Prefer: xmlgraphics-fop:xerces-j2 @@ -1064,9 +1053,8 @@ Prefer: libsane1 Prefer: libglfw3 # have choice for (xclip or wl-clipboard) needed by password-store: wl-clipboard xclip Prefer: -wl-clipboard -Prefer: -firewalld-prometheus-config -# Replaced by google-noto-coloremoji-fonts. DR pending as sr#990015. -Prefer: -noto-coloremoji-fonts +# have choice for pkgconfig(libhs): hyperscan-devel vectorscan-devel. hyperscan is for x86 only, prefer that where possible (for now). +Prefer: hyperscan-devel Ignore: installation-images-openSUSE:cracklib-dict-full Ignore: openSUSE-release:openSUSE-release-ftp,openSUSE-release-dvd5,openSUSE-release-biarch,openSUSE-release-livecdkde,openSUSE-release-livecdgnome @@ -1386,9 +1374,7 @@ Prefer: java-11-openjdk-devel java-11-openjdk java-11-openjdk-headless java-11-o Prefer: java-1_8_0-openj9-devel java-1_8_0-openj9 java-1_8_0-openj9-headless %endif Prefer: java-1_8_0-openjdk-devel java-1_8_0-openjdk java-1_8_0-openjdk-headless java-1_8_0-openjdk-javadoc -Prefer: java-16-openjdk-devel java-16-openjdk java-16-openjdk-headless java-16-openjdk-javadoc Prefer: java-15-openjdk-devel java-15-openjdk java-15-openjdk-headless java-15-openjdk-javadoc -Prefer: java-1_7_0-bootstrap-devel java-1_7_0-bootstrap java-1_7_0-bootstrap-headless %ifarch x86_64 ppc64 s390x sparc64 Substitute: glibc-devel-32bit glibc-devel-32bit glibc-32bit @@ -1511,8 +1497,11 @@ Macros: %source_date_epoch_from_changelog Y # clamp_mtime_to_source_date_epoch Y +# define which postgres is default +%postgresql_default_ver 15 + # define which llvm package builds the system libraries -%product_libs_llvm_ver 14 +%product_libs_llvm_ver 15 # define which gcc package builds the system libraries %product_libs_gcc_ver 12 diff --git a/_staging_workflow b/_staging_workflow index f63cf0e..bfd0e68 100644 --- a/_staging_workflow +++ b/_staging_workflow @@ -13,47 +13,26 @@ - - - - - - - - - - - - - - + - - - - - - - - - - - - - - + + + - - - - - - - - - - + + + + + + + + + + + + +