From 67f62bc4f02feb64424a6ae98dd86f2b82f145c4 Mon Sep 17 00:00:00 2001 From: Bernhard M. Wiedemann Date: Feb 09 2023 20:36:28 +0000 Subject: update --- diff --git a/_attribute b/_attribute index b00e995..b6f9422 100644 --- a/_attribute +++ b/_attribute @@ -4,10 +4,10 @@ last_seen: - boo#1094987: '20221008' + boo#1094987: '20221026' boo#1172073: '20220918' - boo#1183454: '20221025' - boo#1190434: '20221025' + boo#1183454: '20230105' + boo#1190434: '20230208' boo#1190823: '20220409' boo#1196201: '20220525' boo#1196335: '20220524' @@ -20,7 +20,7 @@ boo#1197521: '20220403' boo#1197638: '20220404' boo#1197704: '20220517' - boo#1197719: '20221025' + boo#1197719: '20230208' boo#1197931: '20220412' boo#1198150: '20220421' boo#1198169: '20220413' @@ -29,7 +29,7 @@ boo#1198418: '20220518' boo#1199498: '20220512' boo#1199535: '20220516' - boo#1199881: '20221025' + boo#1199881: '20221109' boo#1199885: '20220606' boo#1199924: '20220601' boo#1199925: '20220601' @@ -42,9 +42,9 @@ boo#1200682: '20220628' boo#1200753: '20220726' boo#1200893: '20220718' - boo#1200894: '20221025' + boo#1200894: '20221102' boo#1201054: '20220711' - boo#1201057: '20221025' + boo#1201057: '20230208' boo#1201082: '20220711' boo#1201348: '20220714' boo#1201349: '20220719' @@ -53,7 +53,7 @@ boo#1201931: '20220726' boo#1202000: '20220804' boo#1202161: '20220810' - boo#1202330: '20221025' + boo#1202330: '20221121' boo#1202460: '20220910' boo#1202495: '20220907' boo#1202497: '20220827' @@ -70,20 +70,56 @@ boo#1204134: '20221008' boo#1204410: '20221018' boo#1204477: '20221019' - boo#1204604: '20221025' + boo#1204604: '20221109' boo#1204605: '20221022' boo#1204629: '20221024' + boo#1204833: '20230208' + boo#1205020: '20221104' + boo#1205032: '20221110' + boo#1205312: '20221113' + boo#1205314: '20230208' + boo#1205362: '20221113' + boo#1205363: '20230119' + boo#1205425: '20221120' + boo#1205540: '20221123' + boo#1205560: '20221124' + boo#1205626: '20221127' + boo#1205633: '20230208' + boo#1205675: '20221128' + boo#1205699: '20221124' + boo#1205745: '20221128' + boo#1205789: '20230201' + boo#1205897: '20230204' + boo#1205918: '20221202' + boo#1206230: '20230206' + boo#1206237: '20221219' + boo#1206431: '20221215' + boo#1206600: '20221222' + boo#1206614: '20230208' + boo#1206949: '20230119' + boo#1207382: '20230123' + boo#1207384: '20230208' + boo#1207385: '20230208' + boo#1207386: '20230208' + boo#1207390: '20230208' + boo#1207509: '20230126' + boo#1207524: '20230125' + boo#1207567: '20230125' + boo#1207892: '20230208' + boo#1207940: '20230208' + boo#1207988: '20230207' boo#12345: '20221004' - bsc#1161276: '20221025' + boo#978027: '20230208' + bsc#1161276: '20221027' bsc#1191684: '20220827' - bsc#1198101: '20221025' + bsc#1198101: '20230208' bsc#1198235: '20220503' bsc#1204279: '20221021' gh#os-autoinst/opensuse-jobgroups#180: '20220728' 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: '20221025' + gh#virt-manager/virt-manager#426: '20221127' poo#105295: '20220518' poo#106676: '20220412' poo#107893: '20220419' @@ -113,44 +149,80 @@ poo#112241: '20220608' poo#112244: '20220608' poo#112580: '20220625' - poo#112649: '20221011' + poo#112649: '20230116' poo#112700: '20220622' poo#112982: '20220623' poo#113051: '20220703' - poo#113075: '20221025' + poo#113075: '20221214' poo#113114: '20220628' poo#113360: '20220712' - poo#113492: '20221025' + poo#113492: '20221102' poo#113549: '20220713' poo#114923: '20220809' poo#114986: '20220804' poo#115115: '20220817' - poo#115133: '20221024' + poo#115133: '20230207' poo#115274: '20221003' poo#115313: '20220816' poo#115364: '20220822' poo#115385: '20220822' poo#115388: '20220911' poo#115421: '20220919' - poo#115694: '20221025' + poo#115694: '20221128' poo#116048: '20220830' poo#116161: '20220904' poo#116704: '20221010' + poo#116815: '20221218' poo#116914: '20221008' poo#116917: '20221001' - poo#117031: '20221025' - poo#117034: '20221025' - poo#117154: '20221025' + poo#116935: '20221026' + poo#117031: '20221105' + poo#117034: '20221202' + poo#117154: '20221124' poo#117214: '20220926' - poo#117331: '20221025' + poo#117331: '20230207' poo#117457: '20220929' poo#117499: '20221008' poo#117559: '20221013' poo#117643: '20221006' poo#117688: '20221012' - poo#118888: '20221025' + poo#117811: '20230208' + poo#118888: '20221108' + poo#119833: '20221102' + poo#119926: '20230125' + poo#120315: '20221110' + poo#120318: '20221110' + poo#120345: '20221114' + poo#120459: '20230208' + poo#120693: '20221116' + poo#120832: '20230208' + poo#120834: '20230205' + poo#120918: '20230110' + poo#120984: '20221129' + poo#120985: '20221128' + poo#121198: '20221215' + poo#121708: '20230208' + poo#121789: '20221212' + poo#121798: '20221220' + poo#121915: '20221212' + poo#121960: '20221213' + poo#122113: '20221222' + poo#122482: '20221227' + poo#122557: '20230118' + poo#122776: '20230110' + poo#122809: '20230111' + poo#122926: '20230208' + poo#123127: '20230208' + poo#123577: '20230124' + poo#123637: '20230126' + poo#123739: '20230208' + poo#123763: '20230206' + poo#123855: '20230131' + poo#123918: '20230205' + poo#123924: '20230208' + poo#124077: '20230208' poo#63397: '20220921' - poo#80628: '20221025' + poo#80628: '20230208' poo#99312: '20220502' @@ -161,8 +233,8 @@ splitter-whitelist = # now just for testing source_projects_expand = devel:languages:haskell -# devel:microos:containers init - rbrown 10 Aug 2022 -devel-whitelist = devel:microos:containers +# devel:automotive whitelisted on 20230111 | security:sensor on 20230118 +devel-whitelist = network:samba:CONTAINERS # packagelist generator related configuration pkglistgen-archs = i586 x86_64 @@ -175,7 +247,7 @@ nocleanup-packages = 000product 000release-packages bootstrap-copy # subpackages of ring packages with unacceptable requires (don't abuse) repo_checker-binary-whitelist-ring = patterns-media-rest_dvd patterns-media-rest_cd_x11 patterns-devel-base-devel_web patterns-base-update_test monitoring-plugins-metadata codec2-examples libreoffice-l10n-fi java-1_8_0-openjdk-accessibility hplip-scan-utils patterns-kde-devel_qt6 -repo_checker-allowed-in-cycles = acl,attr,audit,autoconf,automake,bc,binutils,bison,bzip2,compat-usrmerge,cpio,crypto-policies,debugedit,dejagnu,diffutils,dwz,e2fsprogs,ed,elfutils,expat,expect,fdupes,file,findutils,fipscheck,flex,gawk,gcc,gcc12,gdbm,gettext-runtime-mini,glibc,glibc:i686,gmp,gpm,gzip,help2man,isl,keyutils,krb5-mini,libcap,libcap-ng,libdb-4_8,libeconf,libedit,libffi,libgcrypt,libgpg-error,libnsl,libnss_usrfiles,libseccomp,libselinux,libsemanage,libsepol,libtirpc,libtool,libverto,libxcrypt,libzio,linux-glibc-devel,lua-macros,lua54,m4,make,makedepend,meson,mpc,mpdecimal,mpfr,ncurses,netcfg,ninja,openssl,openssl-1_1,pam,patch,pcre2,perl,perl-Text-Unidecode,perl-gettext,permissions,pkgconf,popt,python-rpm-macros,python-rpm-packaging,python-flit-core:primary,python-packaging:primary,python-pyparsing:primary,python310:base,readline,rpm,screen,shadow,system-user-root,system-users,systemd-rpm-macros,systemtap-headers,sysuser-tools,tcl,tclap,tcpd,texinfo,timezone,update-alternatives,utempter,util-linux,which,xz,zlib,zstd, +repo_checker-allowed-in-cycles = acl,attr,audit,autoconf,automake,bc,binutils,bison,bzip2,compat-usrmerge,cpio,crypto-policies,debugedit,dejagnu,diffutils,dwz,e2fsprogs,ed,elfutils,expat,expect,fdupes,file,findutils,fipscheck,flex,gawk,gcc,gcc12,gcc13,gdbm,gettext-runtime-mini,glibc,glibc:i686,gmp,gpm,gzip,help2man,isl,keyutils,krb5-mini,libcap,libcap-ng,libdb-4_8,libeconf,libedit,libffi,libgcrypt,libgpg-error,libnsl,libnss_usrfiles,libseccomp,libselinux,libsemanage,libsepol,libtirpc,libtool,libverto,libxcrypt,libzio,linux-glibc-devel,lua-macros,lua54,m4,make,makedepend,meson,mpc,mpdecimal,mpfr,ncurses,netcfg,ninja,openssl,openssl-1_1,openssl-3,pam,patch,pcre2,perl,perl-Text-Unidecode,perl-gettext,permissions,pkgconf,popt,python-rpm-macros,python-rpm-packaging,python-flit-core:primary,python-packaging:primary,python-pyparsing:primary,python310:base,readline,rpm,screen,shadow,system-user-root,system-users,systemd-rpm-macros,systemtap-headers,sysuser-tools,tcl,tclap,tcpd,texinfo,timezone,update-alternatives,utempter,util-linux,which,xxhash,xz,zlib,zstd, staging-required-checks-adi = installcheck repo_checker-project-skip = True @@ -194,11 +266,11 @@ rebuildpacs-leafs = branding-openSUSE PackageKit-branding-openSUSE xfce4-brandin s/openSUSE-/openSUSE-Staging:$LETTER-/ - 20221026 + 20230209 arch: x86_64 -jobs_num: 312 +jobs_num: 304 openqa_group: openSUSE Tumbleweed openqa_server: https://openqa.opensuse.org product_repo: images @@ -212,22 +284,16 @@ products: - ceph-image: - x86_64 - csi-attacher-image: - - i586 - x86_64 - csi-livenessprobe-image: - - i586 - x86_64 - csi-node-driver-registrar-image: - - i586 - x86_64 - csi-provisioner-image: - - i586 - x86_64 - csi-resizer-image: - - i586 - x86_64 - csi-snapshotter-image: - - i586 - x86_64 - kubic-coredns-image: - x86_64 @@ -266,12 +332,10 @@ products: - kubic-nfs-client-provisioner-image: - x86_64 - kubic-pause-image: - - i586 - x86_64 - kubic-rbac-manager-image: - x86_64 - kubic-velero-image: - - i586 - x86_64 - kubic-weave-kube-image: - x86_64 @@ -311,27 +375,21 @@ products: - x86_64 - opensuse-rmt-server-image: - x86_64 - - opensuse-rstudio-desktop: - - x86_64 - - opensuse-rstudio-server: - - x86_64 +# - opensuse-rstudio-desktop: +# - x86_64 +# - opensuse-rstudio-server: +# - x86_64 - opensuse-spamassassin-image: - x86_64 - opensuse-squid-image: - x86_64 -# - opensuse-tensorflow2-image: -# - x86_64 - opensuse-toolbox-image: - - i586 - x86_64 - opensuse-tumbleweed-image:docker: - - i586 - x86_64 - opensuse-tumbleweed-dnf-image:docker-dnf: - - i586 - x86_64 - opensuse-tumbleweed-dnf-image:docker-microdnf: - - i586 - x86_64 - opensuse-wsdd-image: - x86_64 @@ -340,16 +398,12 @@ products: - prometheus-webhook-snmp-image: - x86_64 - tumbleweed-busybox-image: - - i586 - x86_64 - busybox-image: - - i586 - x86_64 - micro-image: - - i586 - x86_64 - minimal-image: - - i586 - x86_64 containerfile: - cdi-apiserver-container: @@ -367,45 +421,44 @@ products: - cdi-uploadserver-container: - x86_64 - cups-image: - - i586 - x86_64 - go1.16-devel-container: - - i586 - x86_64 - go1.17-devel-container: - - i586 - x86_64 - go1.18-devel-container: - - i586 - x86_64 - httpd-image: - - i586 + - x86_64 + - influxdb-image: - x86_64 - java11-devel-container: - - i586 - x86_64 - java15-devel-container: - - i586 - x86_64 - keylime-control-plane-image: - - i586 - x86_64 - microos-docserv-image: - x86_64 - opensuse-memcached-image: - - i586 - x86_64 - rust-keylime-image: - - i586 + - x86_64 + - samba-ad-dc-image: + - x86_64 + - samba-ad-server: + - x86_64 + - samba-client: + - x86_64 + - samba-server: + - x86_64 + - samba-toolbox: - x86_64 - samba-image: - - i586 - x86_64 - tomcat-image: - - i586 - x86_64 - init-image: - - i586 - x86_64 - virt-api-container: - x86_64 @@ -420,7 +473,6 @@ products: - virt-operator-container: - x86_64 - virt-vmdp-container: - - i586 - x86_64 - virt-exportproxy-container: - x86_64 @@ -437,17 +489,9 @@ products: - kiwi-images-wsl: - i586 - x86_64 - - kiwi-templates-JeOS:MS-HyperV: - - x86_64 - - kiwi-templates-JeOS:OpenStack-Cloud: - - x86_64 - - kiwi-templates-JeOS:VMware: - - x86_64 - - kiwi-templates-JeOS:kvm-and-xen: - - x86_64 - kiwi-templates-Minimal:MS-HyperV: - x86_64 - - kiwi-templates-Minimal:OpenStack-Cloud: + - kiwi-templates-Minimal:Cloud: - x86_64 - kiwi-templates-Minimal:VMware: - x86_64 @@ -475,6 +519,8 @@ products: - x86_64 - openSUSE-MicroOS:OpenStack-Cloud: - x86_64 + - openSUSE-MicroOS:SelfInstall: + - x86_64 - openSUSE-MicroOS:Vagrant: - x86_64 - openSUSE-MicroOS:VirtualBox: @@ -482,22 +528,16 @@ products: - openSUSE-MicroOS:VMware: - x86_64 - opensuse-tumbleweed-dnf-image:lxc-dnf: - - i586 - x86_64 - opensuse-tumbleweed-dnf-image:lxc-microdnf: - - i586 - x86_64 - opensuse-tumbleweed-dnf-image:networkd-dnf: - - i586 - x86_64 - opensuse-tumbleweed-dnf-image:networkd-microdnf: - - i586 - x86_64 - opensuse-tumbleweed-image:lxc: - - i586 - x86_64 - opensuse-tumbleweed-image:networkd: - - i586 - x86_64 - openSUSE-Tumbleweed-Yomi:livecd: - x86_64 @@ -527,9 +567,9 @@ set_snapshot_number: True failed: '' -published: '20221025' -publishing: '20221025' -testing: '20221025' +published: '20230208' +publishing: '20230208' +testing: '20230208' diff --git a/_config b/_config index 94fccf9..05448df 100644 --- a/_config +++ b/_config @@ -1,4 +1,4 @@ -Prefer: yast2-schema-default +Prefer: -yast2-schema-micro %define gcc_version 12 # testing new cycle algorithm @@ -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:20221005 +ExpandFlags: macroserial:20230119 ExpandFlags: kiwi-nobasepackages ExpandFlags: docker-nobasepackages @@ -19,17 +19,28 @@ BuildFlags: vmfstype:ext4 # nodirindex enabled 2020-12-31 - https://github.com/openSUSE/obs-build/pull/634 BuildFlags: vmfsoptions:nodirindex -# Help with the switch to the gcc9 provided libs: -Prefer: libasan6 libasan6-32bit libubsan1 libubsan1-32bit libgfortran5 +# Help with the switch to the gcc provided libs: +# Do not use the -gcc11 variants if different providers exist +Prefer: -libgfortran5-gcc11 +Prefer: -libubsan1-gcc11 +Prefer: -libubsan1-gcc11-32bit +# Do not use the -gcc12 variants if different providers exist +Prefer: -libasan8-gcc12 +Prefer: -libasan8-gcc12-32bit +Prefer: -libgfortran5-gcc12 +Prefer: -libtsan2-gcc12 +Prefer: -libubsan1-gcc12 +Prefer: -libubsan1-gcc12-32bit Patterntype: rpm-md ymp +RepoType: rpm-md:sha512 %if "%_repository" == "images" Type: kiwi Repotype: none Patterntype: none Prefer: openSUSE-release-ftp Support: release-compare - BuildFlags: obsgendiff +# BuildFlags: obsgendiff %endif %if "%_repository" == "containerfile" @@ -64,7 +75,7 @@ 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:Containers" || "%_project" == "openSUSE:Factory:RISCV" || "%_project" == "openSUSE:Factory:zSystems" +%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" || "%_project" == "openSUSE:Factory:LegacyX86" BuildFlags: excludebuild:openh264 Macros: %vendor openSUSE @@ -73,7 +84,7 @@ Macros: :Macros %endif -%if "%_project" == "openSUSE:Factory" || "%_project" == "openSUSE:Factory:PowerPC" || "%_project" == "openSUSE:Factory:ARM" || "%_project" == "openSUSE:Factory:Rebuild" || "%_project" == "openSUSE:Factory:Live" || "%_project" == "openSUSE:Factory:NonFree" +%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" Substitute: kiwi-image:docker python3-kiwi kiwi-systemdeps-containers container-build-checks-vendor-openSUSE container-build-checks-strict Substitute: system-packages:docker kmod kernel-default docker createrepo_c container-build-checks-vendor-openSUSE container-build-checks-strict Substitute: system-packages:podman podman buildah createrepo_c release-compare container-build-checks-vendor-openSUSE container-build-checks-strict @@ -85,7 +96,7 @@ Substitute: system-packages:docker kmod kernel-default docker createrepo_c conta Substitute: system-packages:podman podman buildah createrepo_c release-compare container-build-checks-vendor-openSUSE %endif -%if "%_project" == "openSUSE:Factory" || "%_project" == "openSUSE:Factory:PowerPC" || "%_project" == "openSUSE:Factory:ARM" || "%_project" == "openSUSE:Factory:zSystems" +%if "%_project" == "openSUSE:Factory" || "%_project" == "openSUSE:Factory:PowerPC" || "%_project" == "openSUSE:Factory:ARM" || "%_project" == "openSUSE:Factory:zSystems" || "%_project" == "openSUSE:Factory:LegacyX86" BuildFlags: excludebuild:openh264 %endif @@ -140,6 +151,16 @@ Substitute: netcfg netcfg libnss_usrfiles2 BuildFlags: useccache:webkit2gtk3:gtk4 #%endif +# 2023-01-19 - x86-64-vN hwcaps libraries can be built and will require proper HW support +%ifarch x86_64 +Macros: +%suse_build_hwcaps_libs \ +#!BuildTarget: x86_64_v3-linux,x86_64-linux \ +#!BuildConstraint: hardware:cpu:flag x86-64-v3 \ +%{nil} +:Macros +%endif + # slsaprovenance - as described at https://slsa.dev/provenance/v0.2 # slsaprovenance diabled on Apr 28 2022 # 07:29 < adrianS> DimStar: the slsafiles get not correctly generated, please disable the prjconf setting for now @@ -151,10 +172,11 @@ Conflict: python3-kiwi:libsystemd0-mini Conflict: python3-kiwi:systemd-mini-sysvinit # LUA namespace migration - slowly moving to the new names (keep ports in mind!) -# lua, lua51, lua52 and lua53 all provide 'lua'; version 5.3 is the 'target'; lua will be deleted in the future -Prefer: lua54 lua53 lua51 +# lua, lua51, lua53 and lua54 all provide 'lua'; version 5.4 is the 'target'; lua will be deleted in the future +%define lua_pref lua54 +Prefer: %{lua_pref} lua53 lua51 Prefer: liblua5_4-5 liblua5_3-5 liblua5_1-5 -Prefer: lua54-devel lua53-devel lua51-devel +Prefer: %{lua_pref}-devel lua53-devel lua51-devel Prefer: libtolua++-5_4-devel libtolua++-5_3-devel libtolua++-5_1-devel Preinstall: liblua5_4-5 @@ -281,6 +303,9 @@ ExportFilter: ^flash-player.*\.i586.rpm$ . x86_64 ExportFilter: ^novell-messenger-client.*\.i586.rpm$ . x86_64 ExportFilter: ^openCryptoki-32bit.*\.s390.rpm$ . s390x +# Make grub2-i386-efi available on x86_64 / support x86_64 CPU on 32bit UEFI - boo#1208057 +ExportFilter: ^grub2-i386-efi.*\.noarch\.rpm$ . x86_64 + ############ # For QEMU # ############ @@ -406,13 +431,13 @@ Ignore: systemd-mini-container:this-is-only-for-build-envs Ignore: udev-mini:this-is-only-for-build-envs # Ring0 packages should not pull in 'info' - making the base VM smaller -Ignore: libtool:info Ignore: autoconf:info Ignore: automake:info Ignore: binutils:info Ignore: bison:info Ignore: coreutils:info Ignore: cpio:info +Ignore: dejagnu:info Ignore: diffutils:info Ignore: findutils:info Ignore: flex:info @@ -424,6 +449,7 @@ Ignore: groff:info Ignore: gzip:info Ignore: help2man:info Ignore: libgcrypt-devel:info +Ignore: libtool:info Ignore: m4:info Ignore: make:info Ignore: sed:info @@ -432,6 +458,10 @@ Ignore: util-linux:info Ignore: polkit-default-privs:polkit +# syslog-service only starts with network enabled, but inside OBS we have no network anyway +Ignore: syslog-service:sysvinit(network) +Ignore: syslog-service:service(network) + # tcl requires sqlite3-tcl to uphold the promise from upstream to be complete # but as we decide to build sqlite3-tcl as part of sqlite, not tcl (to get more up-to-date version) # we need to ignore the tcl -> sqlite dep @@ -482,6 +512,11 @@ 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 python3-Cython: python310-Cython python310-Cython3 +Prefer: -python310-Cython3 python39-Cython3 -python38-Cython3 + +Prefer: -procps4 + # have choice for (python36-qt5 or python36-PyQt6) needed by python36-pytest-qt 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 @@ -506,6 +541,7 @@ Prefer: -budgie-desktop Prefer: python38-tornado Prefer: python39-tornado Prefer: python310-tornado +Prefer: python311-tornado Prefer: -gnome-bluetooth-1 @@ -534,6 +570,7 @@ Prefer: python39-prompt_toolkit python38-prompt_toolkit python310-prompt_toolkit # When perl provides a module that is also in a different package, but the consumer specifies no version, we go with perl/perl-base Prefer: perl-base perl +Prefer: perl-JSON-XS # Lightdm requires 'a greeter' - we prefer the default lightdm-gtk-greeter Prefer: lightdm-gtk-greeter @@ -549,13 +586,15 @@ Prefer: %{php_pref}-devel Prefer: %{php_pref}-pear Prefer: %{php_pref}-tokenizer Prefer: apache2-mod_%{php_pref} -Prefer: php7:php7-cli Prefer: php8:php8-cli # azure-cli reports: have choice for python3-vsts needed by python3-azure-functions-devops-build: python3-azure-devops python3-vsts # Use the real package name Prefer: python38-vsts python39-vsts +# have choice for pkgconfig(wlroots): wlroots-devel wlroots10-devel +Prefer: -wlroots10-devel + # have choice for (sysvinit(network) or service(network)) needed by sysconfig: NetworkManager wicked-service Prefer: -NetworkManager @@ -612,7 +651,6 @@ Prefer: -alsa-topology-devel-32bit Prefer: -armadillo-devel-32bit Prefer: -arpack-ng-devel-32bit Prefer: -at-spi2-core-devel-32bit -Prefer: -atkmm-devel-32bit Prefer: -atkmm1_6-devel-32bit Prefer: -audiofile-devel-32bit Prefer: -audit-devel-32bit @@ -621,8 +659,6 @@ Prefer: -binutils-devel-32bit Prefer: -blas-devel-32bit Prefer: -bluez-devel-32bit Prefer: -cairo-devel-32bit -Prefer: -cairomm-devel-32bit -Prefer: -cairomm1_0-devel-32bit Prefer: -cblas-devel-32bit Prefer: -chmlib-devel-32bit Prefer: -cppunit-devel-32bit @@ -731,7 +767,6 @@ Prefer: -libXxf86vm-devel-32bit Prefer: -libacl-devel-32bit Prefer: -libadns-devel-32bit Prefer: -libaio-devel-32bit -Prefer: -libart_lgpl-devel-32bit Prefer: -libattr-devel-32bit Prefer: -libavc1394-devel-32bit Prefer: -libbasicobjects-devel-32bit @@ -747,6 +782,7 @@ Prefer: -libcurl-devel-32bit Prefer: -libdb-4_8-devel-32bit Prefer: -libdbi-devel-32bit Prefer: -libdbusmenu-qt5-devel-32bit +Prefer: -libdecor-devel-32bit Prefer: -libdhash-devel-32bit Prefer: -libdmx-devel-32bit Prefer: -libdrm-devel-32bit @@ -908,6 +944,9 @@ 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 +Prefer: -ruby3.2-rubygem-public_suffix-3.1 + +Prefer: -ruby3.1-rubygem-kramdown # We have opencv and opencv3 - as usual, the unversioned one should win Prefer: opencv-devel @@ -918,7 +957,8 @@ Prefer: python38-pytest python39-pytest python310-pytest # Help OBS over the openssl-1_1_0 -> openssl-1_1 rename; OBS keeps the -32bit lingering around # https://github.com/openSUSE/open-build-service/issues/4373 # We prefer the new name -Prefer: libopenssl1_1-32bit openssl-1_1 +Prefer: openssl +#Prefer: libopenssl1_1-32bit openssl-1_1 # Enchant has multiple backends to chose from, make a decision for OBS Prefer: enchant-1-backends @@ -944,7 +984,7 @@ Prefer: libstdc++6 libgcc_s1 libquadmath0 libhwasan0 libgccjit0 Prefer: libstdc++6-32bit libstdc++6-64bit Prefer: syslog-service Prefer: poppler-tools -Prefer: libjpeg8-devel libjpeg-turbo +Prefer: -libjpeg62-devel Prefer: microcode_ctl:kernel-default Prefer: yast2-control-center-qt Prefer: wine @@ -991,8 +1031,10 @@ Prefer: -unzip-rcc Prefer: -primus -primus-32bit Prefer: -staging-build-key Prefer: -clutter-gst-devel -# We have multiple versions of ffmpeg available, the preferred one is ffmpeg4, followd by 3, followed by 2 -%define ffmpeg_pref ffmpeg-4 +# We have multiple versions of ffmpeg available, the preferred one is ffmpeg5, followd by 4, followed by 3 +%define ffmpeg_pref ffmpeg-5 +Prefer: %{ffmpeg_pref}-mini-libs +Prefer: %{ffmpeg_pref}-mini-devel 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 # oxygen5-icon-theme osboletes oxygen-icon-theme Prefer: oxygen5-icon-theme @@ -1287,6 +1329,17 @@ Macros: %rubydevelruby31() ruby3.1-devel %{expand:%%rubydevelx%*} %{expand:%%{rubydevel%*}} %rubydevelxruby31() %{expand:%%{rubydevelx%*}} +### And now Ruby 3.2 + +%rubygemsruby32() rubygem(ruby:3.2.0:%{expand:%%rubygemsx%*} %{expand:%%{rubygems%*}} +%rubygemsxruby32() %{expand:%%{rubygemsx%*}} + +%rubyruby32() ruby3.2 %{expand:%%rubyx%*} %{expand:%%{ruby%*}} +%rubyxruby32() %{expand:%%{rubyx%*}} + +%rubydevelruby32() ruby3.2-devel %{expand:%%rubydevelx%*} %{expand:%%{rubydevel%*}} +%rubydevelxruby32() %{expand:%%{rubydevelx%*}} + ### Things to define default ruby stuff for the distro %rb_default_ruby ruby31 @@ -1380,6 +1433,8 @@ 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-19-openjdk-devel java-19-openjdk java-19-openjdk-headless java-19-openjdk-javadoc +Prefer: java-18-openjdk-devel java-18-openjdk java-18-openjdk-headless java-18-openjdk-javadoc Prefer: java-15-openjdk-devel java-15-openjdk java-15-openjdk-headless java-15-openjdk-javadoc %ifarch x86_64 ppc64 s390x sparc64 @@ -1490,8 +1545,8 @@ Macros: %suseconfig_fonts_prereq perl aaa_base # I can't just not define it, as otherwise all specs using it break: [ 25s] error: line 27: Empty tag: Requires(post): %install_info_prereq /bin/sh -%kernel_module_package_buildreq kmod-compat kernel-syms -%kernel_module_package_buildreqs kmod-compat kernel-syms +%kernel_build_shell_package bash-sh +%kernel_module_package_buildreqs modutils kernel-syms kmod-compat suse-kernel-rpm-scriptlets %kernel_build_shell_package %sles_version 0 %ul_version 0 @@ -1510,7 +1565,7 @@ Macros: %product_libs_llvm_ver 15 # define which gcc package builds the system libraries -%product_libs_gcc_ver 12 +%product_libs_gcc_ver 13 # The following shlibs have latest versions built from GCC 6 sources %product_libs_gcc_ver_libasan3 6 %product_libs_gcc_ver_libgo9 6 @@ -1540,6 +1595,10 @@ Macros: %product_libs_gcc_ver_libgo19 11 %product_libs_gcc_ver_libgphobos2 11 %product_libs_gcc_ver_libgdruntime2 11 +# The following shlibs have the latest version build from GCC 12 sources +%product_libs_gcc_ver_libgo21 12 +%product_libs_gcc_ver_libgphobos3 12 +%product_libs_gcc_ver_libgdruntime3 12 %gcc_version 12 %ext_info .gz diff --git a/_meta b/_meta index 3ac7bed..2053656 100644 --- a/_meta +++ b/_meta @@ -28,6 +28,7 @@ Have a look at http://en.opensuse.org/Portal:Factory for more details. + x86_64 i586 @@ -37,6 +38,8 @@ Have a look at http://en.opensuse.org/Portal:Factory for more details.i586 + i586 + x86_64 ppc64le ppc64 ppc @@ -51,14 +54,12 @@ Have a look at http://en.opensuse.org/Portal:Factory for more details. local - i586 x86_64 - i586 x86_64 diff --git a/_staging_workflow b/_staging_workflow index f9e9d72..8e53ea4 100644 --- a/_staging_workflow +++ b/_staging_workflow @@ -15,16 +15,17 @@ - - - - + - + + + + + + -