Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package build for openSUSE:Factory checked
in at 2023-05-28 19:21:51
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/build (Old)
and /work/SRC/openSUSE:Factory/.build.new.1533 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "build"
Sun May 28 19:21:51 2023 rev:153 rq:1089263 version:20230527
Changes:
--------
--- /work/SRC/openSUSE:Factory/build/build.changes 2023-05-02
16:18:12.785521160 +0200
+++ /work/SRC/openSUSE:Factory/.build.new.1533/build.changes 2023-05-28
19:22:04.784689709 +0200
@@ -1,0 +2,10 @@
+Sat May 27 05:41:05 UTC 2023 - Adrian Schröter <adr...@suse.de>
+
+- sync tumbleweed config
+- addition cross architecture build configs
+- docker builds: create pkgsummaries files if requested
+- kiwi builds: create pkgsummaries files if requested
+- Delete bogus space when copying the .packages files
+- container: fixes for startdocker in chroot
+
+-------------------------------------------------------------------
Old:
----
obs-build-20230502.tar.gz
New:
----
obs-build-20230527.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ build.spec ++++++
--- /var/tmp/diff_new_pack.3gIVX2/_old 2023-05-28 19:22:05.300692780 +0200
+++ /var/tmp/diff_new_pack.3gIVX2/_new 2023-05-28 19:22:05.304692803 +0200
@@ -28,7 +28,7 @@
Summary: A Script to Build SUSE Linux RPMs
License: GPL-2.0-only OR GPL-3.0-only
Group: Development/Tools/Building
-Version: 20230502
+Version: 20230527
Release: 0
Source: obs-build-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ PKGBUILD ++++++
--- /var/tmp/diff_new_pack.3gIVX2/_old 2023-05-28 19:22:05.344693041 +0200
+++ /var/tmp/diff_new_pack.3gIVX2/_new 2023-05-28 19:22:05.348693065 +0200
@@ -1,5 +1,5 @@
pkgname=build
-pkgver=20230502
+pkgver=20230527
pkgrel=0
pkgdesc="Build packages in sandbox"
arch=('i686' 'x86_64')
++++++ _service ++++++
--- /var/tmp/diff_new_pack.3gIVX2/_old 2023-05-28 19:22:05.364693160 +0200
+++ /var/tmp/diff_new_pack.3gIVX2/_new 2023-05-28 19:22:05.368693184 +0200
@@ -1,7 +1,7 @@
<services>
<service name="tar_scm" mode="manual">
- <param name="revision">20230502</param>
- <param name="version">20230502</param>
+ <param name="revision">20230527</param>
+ <param name="version">20230527</param>
<param name="url">https://github.com/openSUSE/obs-build.git</param>
<param name="scm">git</param>
<param name="extract">dist/build.changes</param>
++++++ build.dsc ++++++
--- /var/tmp/diff_new_pack.3gIVX2/_old 2023-05-28 19:22:05.388693303 +0200
+++ /var/tmp/diff_new_pack.3gIVX2/_new 2023-05-28 19:22:05.392693327 +0200
@@ -1,6 +1,6 @@
Format: 1.0
Source: build
-Version: 20230502
+Version: 20230527
Binary: build
Maintainer: Adrian Schroeter <adr...@suse.de>
Architecture: all
++++++ debian.changelog ++++++
--- /var/tmp/diff_new_pack.3gIVX2/_old 2023-05-28 19:22:05.416693470 +0200
+++ /var/tmp/diff_new_pack.3gIVX2/_new 2023-05-28 19:22:05.420693494 +0200
@@ -1,4 +1,4 @@
-build (20230502) unstable; urgency=low
+build (20230527) unstable; urgency=low
* Update to current git trunk
- add sles11sp2 build config and adapt autodetection
++++++ obs-build-20230502.tar.gz -> obs-build-20230527.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/obs-build-20230502/.github/workflows/linux.yaml
new/obs-build-20230527/.github/workflows/linux.yaml
--- old/obs-build-20230502/.github/workflows/linux.yaml 2023-05-02
14:14:13.000000000 +0200
+++ new/obs-build-20230527/.github/workflows/linux.yaml 2023-05-27
07:39:11.000000000 +0200
@@ -12,7 +12,7 @@
runs-on: ubuntu-latest
steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v3
with:
fetch-depth: 0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/obs-build-20230502/build-recipe-docker
new/obs-build-20230527/build-recipe-docker
--- old/obs-build-20230502/build-recipe-docker 2023-05-02 14:14:13.000000000
+0200
+++ new/obs-build-20230527/build-recipe-docker 2023-05-27 07:39:11.000000000
+0200
@@ -298,11 +298,13 @@
perl -I$BUILD_DIR -MBuild::Docker -e Build::Docker::showcontainerinfo --
"${args[@]}" "$BUILD_ROOT/$TOPDIR/SOURCES/$RECIPEFILE" "$FILENAME.tar"
"$ALLTAGS" containers/annotation >
"$BUILD_ROOT$TOPDIR/DOCKER/$FILENAME.containerinfo"
# copy over .packages files
- if test -f "$BUILD_ROOT/$TOPDIR/SOURCES/repos/UPLOAD/basepackages" ; then
- cp "$BUILD_ROOT/$TOPDIR/SOURCES/repos/UPLOAD/basepackages"
"$BUILD_ROOT$TOPDIR/DOCKER/$FILENAME.basepackages"
- fi
- if test -f "$BUILD_ROOT/$TOPDIR/SOURCES/repos/UPLOAD/packages" ; then
- cp "$BUILD_ROOT/$TOPDIR/SOURCES/repos/UPLOAD/packages"
"$BUILD_ROOT$TOPDIR/DOCKER/$FILENAME.packages"
+ for i in basepackages packages ; do
+ test -f "$BUILD_ROOT/$TOPDIR/SOURCES/repos/UPLOAD/$i" && cp
"$BUILD_ROOT/$TOPDIR/SOURCES/repos/UPLOAD/$i"
"$BUILD_ROOT$TOPDIR/DOCKER/$FILENAME.$i"
+ done
+ if test -e "$BUILD_ROOT/$TOPDIR/SOURCES/repos/.pkgsummaries" ; then
+ for i in pkgsummaries ; do
+ test -f "$BUILD_ROOT/$TOPDIR/SOURCES/repos/UPLOAD/$i" && cp
"$BUILD_ROOT/$TOPDIR/SOURCES/repos/UPLOAD/$i"
"$BUILD_ROOT$TOPDIR/DOCKER/$FILENAME.$i"
+ done
fi
rm -rf "$BUILD_ROOT/$TOPDIR/SOURCES/repos/UPLOAD"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/obs-build-20230502/build-recipe-kiwi
new/obs-build-20230527/build-recipe-kiwi
--- old/obs-build-20230502/build-recipe-kiwi 2023-05-02 14:14:13.000000000
+0200
+++ new/obs-build-20230527/build-recipe-kiwi 2023-05-27 07:39:11.000000000
+0200
@@ -719,6 +719,24 @@
rm -f "${r%.tar}.containerinfo"
fi
done
+
+ # create package summaries file if requested
+ if test -e "$BUILD_ROOT/$TOPDIR/SOURCES/repos/.pkgsummaries" ; then
+ for r in $BUILD_ROOT/$TOPDIR/KIWI/*.packages ; do
+ test -e "$r" || continue
+ r="${r%.packages}"
+ for rr in $r*.containerinfo ; do
+ test -e "$rr" || continue
+ echo "creating package summaries information"
+ rr="${rr%.containerinfo}"
+ cp --remove-destination
"$BUILD_DIR/create_container_package_list"
"$BUILD_ROOT/tmp/create_container_package_list"
+ chroot "$BUILD_ROOT" /bin/bash
/tmp/create_container_package_list --summaries "${rr#$BUILD_ROOT}.tar" >
"$r.pkgsummaries"
+ rm -f "$BUILD_ROOT/tmp/create_container_package_list"
+ break
+ done
+ done
+ fi
+
if test -n "$KIWI_DERIVED_CONTAINER" ; then
for r in $BUILD_ROOT/$TOPDIR/KIWI/*.packages ; do
test -e "$r" || continue
@@ -728,7 +746,7 @@
echo "creating base package information"
cp --remove-destination
"$BUILD_DIR/create_container_package_list"
"$BUILD_ROOT/tmp/create_container_package_list"
chroot "$BUILD_ROOT" /bin/bash
/tmp/create_container_package_list "${KIWI_DERIVED_CONTAINER#$BUILD_ROOT}" >
"$r.basepackages"
- rm -f "$BUILD_ROOT/tmp/create_derived_package_list"
+ rm -f "$BUILD_ROOT/tmp/create_container_package_list"
break
done
done
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/obs-build-20230502/configs/cross_aarch64.conf
new/obs-build-20230527/configs/cross_aarch64.conf
--- old/obs-build-20230502/configs/cross_aarch64.conf 1970-01-01
01:00:00.000000000 +0100
+++ new/obs-build-20230527/configs/cross_aarch64.conf 2023-05-27
07:39:11.000000000 +0200
@@ -0,0 +1,34 @@
+# Generic cross architecture build config
+# To be combined with a distribution config
+
+HostArch: x86_64
+
+%ifarch aarch64
+Target: aarch64-suse-linux
+%endif
+
+Order: filesystem:cross-aarch64-gcc11
+
+OnlyNative: cross-aarch64-gcc11
+OnlyNative: cross-aarch64-aaa_base
+OnlyNative: fdupes
+OnlyNative: make
+
+AlsoNative: qt6-base-common-devel
+AlsoNative: qt6-base-devel
+AlsoNative: qt6-base-private-devel
+AlsoNative: qt6-tools
+AlsoNative: qt6-tools-devel
+
+Ignore: libncurses6:cross-aarch64-gcc11
+Ignore: cross-aarch64-gcc11:libncurses6
+
+# the checks are mostly not valid for cross build
+Support: !post-build-checks
+
+Macros:
+# needed for build script, needs to be in sync with cross-*-aaa_base
+%cross_sysroot /usr/%{_target_cpu}-suse-linux/sys-root
+%do_profiling 0
+:Macros
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/obs-build-20230502/configs/cross_riscv64.conf
new/obs-build-20230527/configs/cross_riscv64.conf
--- old/obs-build-20230502/configs/cross_riscv64.conf 1970-01-01
01:00:00.000000000 +0100
+++ new/obs-build-20230527/configs/cross_riscv64.conf 2023-05-27
07:39:11.000000000 +0200
@@ -0,0 +1,34 @@
+# Generic cross architecture build config
+# To be combined with a distribution config
+
+HostArch: x86_64
+
+%ifarch riscv64
+Target: riscv64-suse-linux
+%endif
+
+Order: filesystem:cross-riscv64-gcc11
+
+OnlyNative: cross-riscv64-gcc11
+OnlyNative: cross-riscv64-aaa_base
+OnlyNative: fdupes
+OnlyNative: make
+
+AlsoNative: qt6-base-common-devel
+AlsoNative: qt6-base-devel
+AlsoNative: qt6-base-private-devel
+AlsoNative: qt6-tools
+AlsoNative: qt6-tools-devel
+
+Ignore: libncurses6:cross-riscv64-gcc11
+Ignore: cross-riscv64-gcc11:libncurses6
+
+# the checks are mostly not valid for cross build
+Support: !post-build-checks
+
+Macros:
+# needed for build script, needs to be in sync with cross-*-aaa_base
+%cross_sysroot /usr/%{_target_cpu}-suse-linux/sys-root
+%do_profiling 0
+:Macros
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/obs-build-20230502/configs/tumbleweed.conf
new/obs-build-20230527/configs/tumbleweed.conf
--- old/obs-build-20230502/configs/tumbleweed.conf 2023-05-02
14:14:13.000000000 +0200
+++ new/obs-build-20230527/configs/tumbleweed.conf 2023-05-27
07:39:11.000000000 +0200
@@ -1,22 +1,4 @@
-%define _project openSUSE:Factory
-
-### from openSUSE:Factory
-%define _repository standard
-
-Macros:
-%vendor obs://build.opensuse.org/openSUSE:Factory
-%_download_url https://download.opensuse.org/repositories
-%_project openSUSE:Factory
-
-%distribution openSUSE:Factory
-%_project openSUSE:Factory
-
-### from openSUSE:Factory
-
-%_repository standard
-:Macros
-
-Prefer: -yast2-schema-micro
+Prefer: -yast2-schema-micro -yast2-schema
%define gcc_version 13
# testing new cycle algorithm
@@ -25,7 +7,7 @@
# 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:20230420
+ExpandFlags: macroserial:20230508
ExpandFlags: kiwi-nobasepackages
ExpandFlags: docker-nobasepackages
@@ -207,6 +189,8 @@
# Generated by openSUSE-release-tools/repo2fileprovides.py
FileProvides: /bin/awk busybox-gawk gawk
+FileProvides: /usr/bin/dbus-launch dbus-1 dbus-1-x11
+FileProvides: /usr/bin/nmtui NetworkManager-tui
FileProvides: /bin/bash bash bash-legacybin
FileProvides: /bin/cat busybox-coreutils coreutils coreutils-single
FileProvides: /bin/chmod busybox-coreutils coreutils coreutils-single
@@ -254,19 +238,19 @@
FileProvides: /usr/bin/bc bc busybox-bc
FileProvides: /usr/bin/bcc-lua bcc-lua
FileProvides: /usr/bin/bpftrace bpftrace
-FileProvides: /usr/bin/bsh2 bsh2
FileProvides: /usr/bin/bzip2 busybox-bzip2 bzip2
FileProvides: /usr/bin/cat busybox-coreutils coreutils coreutils-single
FileProvides: /usr/bin/cdda2wav cdda2wav
FileProvides: /usr/bin/cdrdao cdrdao
FileProvides: /usr/bin/cdrecord cdrecord
+FileProvides: /usr/bin/chattr busybox-misc e2fsprogs
FileProvides: /usr/bin/chfn shadow
FileProvides: /usr/bin/chgrp busybox-coreutils coreutils coreutils-single
FileProvides: /usr/bin/chmod busybox-coreutils coreutils coreutils-single
FileProvides: /usr/bin/chown busybox-coreutils coreutils coreutils-single
FileProvides: /usr/bin/chsh shadow
FileProvides: /usr/bin/cksum busybox-coreutils coreutils coreutils-single
-FileProvides: /usr/bin/clang clang-tools
+FileProvides: /usr/bin/clang clang11 clang12 clang13 clang14 clang15 clang16
FileProvides: /usr/bin/clear busybox-ncurses-utils ncurses-utils
FileProvides: /usr/bin/clisp clisp
FileProvides: /usr/bin/cmp busybox-diffutils diffutils
@@ -329,7 +313,6 @@
FileProvides: /usr/bin/gs ghostscript gswrap
FileProvides: /usr/bin/gs.bin ghostscript
FileProvides: /usr/bin/guile guile
-FileProvides: /usr/bin/guile1 guile1
FileProvides: /usr/bin/gunzip busybox-gzip gzip zstd-gzip
FileProvides: /usr/bin/gzip busybox-gzip gzip zstd-gzip
FileProvides: /usr/bin/head busybox-coreutils coreutils coreutils-single
@@ -384,6 +367,7 @@
FileProvides: /usr/bin/node nodejs-common
FileProvides: /usr/bin/node18 nodejs18
FileProvides: /usr/bin/node19 nodejs19
+FileProvides: /usr/bin/node20 nodejs20
FileProvides: /usr/bin/nohup busybox-coreutils coreutils coreutils-single
FileProvides: /usr/bin/nslookup bind-utils busybox-bind-utils
FileProvides: /usr/bin/ocamlrun ocaml-runtime
@@ -413,6 +397,7 @@
FileProvides: /usr/bin/python3 python310-base
FileProvides: /usr/bin/python3.10 python310-base
FileProvides: /usr/bin/python3.11 python311-base
+FileProvides: /usr/bin/python3.12 python312-base
FileProvides: /usr/bin/python3.8 python38-base
FileProvides: /usr/bin/python3.9 python39-base
FileProvides: /usr/bin/qemu-img qemu-tools
@@ -522,6 +507,7 @@
FileProvides: /usr/bin/zsh zsh
FileProvides: /usr/sbin/ldconfig glibc
FileProvides: /usr/sbin/showconsole blog
+FileProvides: /usr/bin/chattr e2fsprogs
# Set preferences for above list - work with negative prefers, in order to be
able to catch no-longer existing ones
Prefer: bash-sh
@@ -598,7 +584,7 @@
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
+# 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
############
@@ -804,24 +790,29 @@
# Python3 exists in multiple versions - we currently favor 3.8 (our default):
Prefer: -python39
Prefer: -python39-hotdoc
-Prefer: -python38-txt2tags -python39-txt2tags -python311-txt2tags
+Prefer: -python39-txt2tags -python311-txt2tags
+
+Prefer: -python39-urllib3_1 -python310-urllib3_1 -python311-urllib3_1
# have choice for python3-magic: python38-magic python38-python-magic
-Prefer: -python38-magic -python39-magic -python310-magic
+Prefer: -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
-python311-Cython3
+Prefer: -python310-Cython3 python39-Cython3 -python311-Cython3
# have choice for ntp-daemon: chrony ntp ntpsec
Prefer: chrony
Prefer: -procps4
+# have choice for python39-sqlalchemy >= 1.4: python39-SQLAlchemy
python39-SQLAlchemy1
+Prefer: -python39-SQLAlchemy1 -python310-SQLAlchemy1 -python311-SQLAlchemy1
+
# have choice for (python36-qt5 or python36-PyQt6) needed by python36-pytest-qt
-Prefer: -python310-PyQt6 -python39-PyQt6 -python38-PyQt6 -python3-pyside2
+Prefer: -python310-PyQt6 -python39-PyQt6 -python3-pyside2
Prefer: -python311-PyQt6
# man and mandoc provide man; mandoc claims to be lightweight, but it was
never discussed to be the new default
Prefer: man
@@ -836,6 +827,9 @@
Prefer: -kubernetes1.20-kubelet-common -kubernetes1.21-kubelet-common
-kubernetes1.22-kubelet-common -kubernetes1.23-client-common
Prefer: -kubernetes1.24-client-common -kubernetes1.25-client-common
+# have choice for cmake(KWinDBusInterface) >= MACRO: deepin-kwin-devel
kwin5-devel
+Prefer: -deepin-kwin-devel
+
# have choice for html2text
Prefer: -python38-html2text -python39-html2text -python310-html2text
-python311-html2text
@@ -843,7 +837,6 @@
Prefer: -budgie-desktop
# python-tornado exists in multiple versions, the meta-package python-tornado
defines the system default
-Prefer: python38-tornado
Prefer: python39-tornado
Prefer: python310-tornado
Prefer: python311-tornado
@@ -855,11 +848,8 @@
# There are multiple PK backends available. Favor the openSUSE own zypp backend
Prefer: PackageKit-backend-zypp
-# have choice for pkgconfig(libftdi): libftdi-devel libftdi0-devel
-Prefer: libftdi-devel
-
# have choice for python3-sip: python3-sip-devel python3-sip4
-Prefer: python38-sip-devel python39-sip-devel python310-sip-devel
+Prefer: python39-sip-devel python310-sip-devel
Prefer: -python38-sip4 -python38-sip4-devel
Prefer: -python39-sip4 -python39-sip4-devel
Prefer: -python310-sip4 -python310-sip4-devel
@@ -872,10 +862,6 @@
# 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_toolkit1 -python38-prompt_toolkit1
-python310-prompt_toolkit1
-Prefer: -python311-prompt_toolkit1
-
# 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
@@ -901,8 +887,7 @@
# have choice for python3dist(jupyterlab) = 3.6.2 needed by
jupyter-jupyterlab: python310-jupyterlab python311-jupyterlab
python38-jupyterlab python39-jupyterlab
Prefer: -python311-jupyterlab -python38-jupyterlab -python39-jupyterlab
-Prefer: -python310-jupyter-client7 -python311-jupyter-client7
-python39-jupyter-client7 -python38-jupyter-client7
-Prefer: -jupyter-jupyter-client7
+Prefer: -python310-jupyter-client7 -python311-jupyter-client7
-python39-jupyter-client7
# 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
@@ -941,17 +926,20 @@
# have choice for libz.so.1()(64bit) needed by gcc11: libz-ng-compat1 libz1
# Pick the regular libz.so.1
-Prefer: -libz-ng-compat1 -zlib-ng-compat-devel -libz-ng-compat1-32bit
+Prefer: -libz-ng-compat1 -zlib-ng-compat-devel
# 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
+# 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
# have choice for pkgconfig(libindi): indi-devel libindi-devel
Prefer: -indi-devel
+# have choice for mbedtls-devel needed by bctoolbox-devel: mbedtls-2-devel
mbedtls-devel
+Prefer: -mbedtls-2-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
@@ -1097,7 +1085,6 @@
Prefer: -libcmocka-devel-32bit
Prefer: -libcollection-devel-32bit
Prefer: -libcom_err-devel-32bit
-Prefer: -libcrystalhd-devel-32bit
Prefer: -libcurl-devel-32bit
Prefer: -libdb-4_8-devel-32bit
Prefer: -libdbi-devel-32bit
@@ -1263,18 +1250,14 @@
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.2-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
# python3-pytest should win over the other python3-pytest<n> variants
-Prefer: python38-pytest python39-pytest python310-pytest
+Prefer: 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
@@ -1354,7 +1337,7 @@
Prefer: -staging-build-key
Prefer: -clutter-gst-devel
# We have multiple versions of ffmpeg available, the preferred one is ffmpeg5,
followd by 4, followed by 3
-%define ffmpeg_pref ffmpeg-5
+%define ffmpeg_pref ffmpeg-6
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
@@ -1375,7 +1358,7 @@
Prefer: -xaw3dd -amanda
Prefer: libgcc_s1 libgcc_s1-32bit libgcc_s1-64bit
Prefer: libffi-devel
-Prefer: libatomic1 libitm1 liblsan0 libtsan0 libubsan0
+Prefer: libatomic1 libitm1 liblsan0 libtsan0 libubsan0 -libtsan0-gcc11
Prefer: libatomic1-32bit libcilkrts5-32bit libitm1-32bit libubsan0-32bit
Prefer: libgomp1 libgomp1-32bit libgomp1-64bit
Prefer: libobjc4 libquadmath0
@@ -1606,11 +1589,6 @@
BuildFlags: onlybuild:NetworkManager
BuildFlags: onlybuild:NetworkManager-branding:openSUSE
BuildFlags: onlybuild:SDL2
-BuildFlags: onlybuild:libxmp
-BuildFlags: onlybuild:opusfile
-BuildFlags: onlybuild:libmikmod
-BuildFlags: onlybuild:libmodplug
-BuildFlags: onlybuild:SDL_gfx
BuildFlags: onlybuild:SDL2_Pango
BuildFlags: onlybuild:SDL2_gfx
BuildFlags: onlybuild:SDL2_image
@@ -1620,11 +1598,13 @@
BuildFlags: onlybuild:SDL2_ttf
BuildFlags: onlybuild:SDL_Pango
BuildFlags: onlybuild:SDL_bgi
+BuildFlags: onlybuild:SDL_gfx
BuildFlags: onlybuild:SDL_image
BuildFlags: onlybuild:SDL_mixer
BuildFlags: onlybuild:SDL_net
BuildFlags: onlybuild:SDL_sound
BuildFlags: onlybuild:SDL_ttf
+BuildFlags: onlybuild:a52dec
BuildFlags: onlybuild:aaa_base
BuildFlags: onlybuild:accountsservice
BuildFlags: onlybuild:acl
@@ -1633,11 +1613,11 @@
BuildFlags: onlybuild:adwaita-icon-theme
BuildFlags: onlybuild:alsa
BuildFlags: onlybuild:alsa-oss
-BuildFlags: onlybuild:alsa-ucm-conf
BuildFlags: onlybuild:alsa-plugins
+BuildFlags: onlybuild:alsa-ucm-conf
BuildFlags: onlybuild:alsa-utils
BuildFlags: onlybuild:ant
-BuildFlags: onlybuild:antlr-bootstrap
+BuildFlags: onlybuild:antlr:antlr-bootstrap
BuildFlags: onlybuild:apache-rpm-macros
BuildFlags: onlybuild:apache-rpm-macros-control
BuildFlags: onlybuild:apache2
@@ -1646,6 +1626,7 @@
BuildFlags: onlybuild:apitrace
BuildFlags: onlybuild:apparmor
BuildFlags: onlybuild:apparmor-rpm-macros
+BuildFlags: onlybuild:apparmor:libapparmor
BuildFlags: onlybuild:appstream-glib
BuildFlags: onlybuild:apr
BuildFlags: onlybuild:apr-util
@@ -1721,6 +1702,7 @@
BuildFlags: onlybuild:cmocka
BuildFlags: onlybuild:cmuclmtk
BuildFlags: onlybuild:codec2
+BuildFlags: onlybuild:codespell
BuildFlags: onlybuild:cogl
BuildFlags: onlybuild:colord
BuildFlags: onlybuild:colord-gtk
@@ -1775,6 +1757,7 @@
BuildFlags: onlybuild:double-conversion
BuildFlags: onlybuild:doxygen
BuildFlags: onlybuild:dpkg
+BuildFlags: onlybuild:dpkg:update-alternatives
BuildFlags: onlybuild:dracut
BuildFlags: onlybuild:drpm
BuildFlags: onlybuild:dtc
@@ -1790,7 +1773,7 @@
BuildFlags: onlybuild:eglexternalplatform
BuildFlags: onlybuild:eigen3
BuildFlags: onlybuild:elfutils
-BuildFlags: onlybuild:elfutils-debuginfod
+BuildFlags: onlybuild:elfutils:elfutils-debuginfod
BuildFlags: onlybuild:ell
BuildFlags: onlybuild:enca
BuildFlags: onlybuild:enchant
@@ -1806,8 +1789,8 @@
BuildFlags: onlybuild:ffado
BuildFlags: onlybuild:ffmpeg-4
BuildFlags: onlybuild:ffmpeg-5
-BuildFlags: onlybuild:ffmpeg-6
BuildFlags: onlybuild:ffmpeg-5:ffmpeg-5-mini
+BuildFlags: onlybuild:ffmpeg-6
BuildFlags: onlybuild:ffmpeg-6:ffmpeg-6-mini
BuildFlags: onlybuild:ffnvcodec
BuildFlags: onlybuild:fftw3:standard
@@ -1873,7 +1856,7 @@
BuildFlags: onlybuild:geoclue2
BuildFlags: onlybuild:geocode-glib
BuildFlags: onlybuild:gettext-runtime
-BuildFlags: onlybuild:gettext-runtime-mini
+BuildFlags: onlybuild:gettext-runtime:gettext-runtime-mini
BuildFlags: onlybuild:ghostscript
BuildFlags: onlybuild:ghostscript-fonts
BuildFlags: onlybuild:ghostscript:mini
@@ -1939,11 +1922,11 @@
BuildFlags: onlybuild:gsound
BuildFlags: onlybuild:gssdp
BuildFlags: onlybuild:gstreamer
-BuildFlags: onlybuild:gstreamer-plugins-good
-BuildFlags: onlybuild:gstreamer-plugins-ugly
-BuildFlags: onlybuild:gstreamer-plugins-libav
BuildFlags: onlybuild:gstreamer-plugins-bad
BuildFlags: onlybuild:gstreamer-plugins-base
+BuildFlags: onlybuild:gstreamer-plugins-good
+BuildFlags: onlybuild:gstreamer-plugins-libav
+BuildFlags: onlybuild:gstreamer-plugins-ugly
BuildFlags: onlybuild:gtk-doc
BuildFlags: onlybuild:gtk2
BuildFlags: onlybuild:gtk2-engines
@@ -1993,7 +1976,7 @@
BuildFlags: onlybuild:itstool
BuildFlags: onlybuild:jack
BuildFlags: onlybuild:java-17-openjdk
-BuildFlags: onlybuild:java-cup-bootstrap
+BuildFlags: onlybuild:java-cup:java-cup-bootstrap
BuildFlags: onlybuild:javapackages-tools
BuildFlags: onlybuild:javapackages-tools:extras
BuildFlags: onlybuild:jbigkit
@@ -2023,7 +2006,7 @@
BuildFlags: onlybuild:kmod
BuildFlags: onlybuild:knotifications
BuildFlags: onlybuild:krb5
-BuildFlags: onlybuild:krb5-mini
+BuildFlags: onlybuild:krb5:krb5-mini
BuildFlags: onlybuild:kservice
BuildFlags: onlybuild:kwallet
BuildFlags: onlybuild:kwidgetsaddons
@@ -2077,7 +2060,6 @@
BuildFlags: onlybuild:libalternatives
BuildFlags: onlybuild:libao
BuildFlags: onlybuild:libaom
-BuildFlags: onlybuild:libapparmor
BuildFlags: onlybuild:libarchive
BuildFlags: onlybuild:libass
BuildFlags: onlybuild:libassuan
@@ -2124,6 +2106,8 @@
BuildFlags: onlybuild:libdovi
BuildFlags: onlybuild:libdrm
BuildFlags: onlybuild:libdv
+BuildFlags: onlybuild:libdvdread
+BuildFlags: onlybuild:libdwarf
BuildFlags: onlybuild:libeconf
BuildFlags: onlybuild:libedit
BuildFlags: onlybuild:libepoxy
@@ -2180,8 +2164,11 @@
BuildFlags: onlybuild:libmetalink
BuildFlags: onlybuild:libmicrodns
BuildFlags: onlybuild:libmicrohttpd
+BuildFlags: onlybuild:libmikmod
BuildFlags: onlybuild:libmnl
+BuildFlags: onlybuild:libmodplug
BuildFlags: onlybuild:libmodulemd
+BuildFlags: onlybuild:libmpeg2
BuildFlags: onlybuild:libmspack
BuildFlags: onlybuild:libmysofa
BuildFlags: onlybuild:libndp
@@ -2235,7 +2222,6 @@
BuildFlags: onlybuild:libqt5-qtvirtualkeyboard
BuildFlags: onlybuild:libqt5-qtwayland
BuildFlags: onlybuild:libqt5-qtwebchannel
-BuildFlags: onlybuild:snobol4
BuildFlags: onlybuild:libqt5-qtwebsockets
BuildFlags: onlybuild:libqt5-qtx11extras
BuildFlags: onlybuild:libqt5-qtxmlpatterns
@@ -2252,10 +2238,11 @@
BuildFlags: onlybuild:libseccomp
BuildFlags: onlybuild:libsecret
BuildFlags: onlybuild:libselinux
-BuildFlags: onlybuild:libselinux-bindings
+BuildFlags: onlybuild:libselinux:libselinux-bindings
BuildFlags: onlybuild:libsemanage
BuildFlags: onlybuild:libsepol
BuildFlags: onlybuild:libserf
+BuildFlags: onlybuild:libshout
BuildFlags: onlybuild:libsigc++2
BuildFlags: onlybuild:libsigsegv
BuildFlags: onlybuild:libslirp
@@ -2274,6 +2261,7 @@
BuildFlags: onlybuild:libtheora
BuildFlags: onlybuild:libtirpc
BuildFlags: onlybuild:libtool
+BuildFlags: onlybuild:libtpms
BuildFlags: onlybuild:libunbound-devel-mini
BuildFlags: onlybuild:libunistring
BuildFlags: onlybuild:libunwind
@@ -2286,7 +2274,7 @@
BuildFlags: onlybuild:libva:gl
BuildFlags: onlybuild:libvdpau
BuildFlags: onlybuild:libverto
-BuildFlags: onlybuild:libverto-libev
+BuildFlags: onlybuild:libverto:libverto-libev
BuildFlags: onlybuild:libvisual
BuildFlags: onlybuild:libvoikko
BuildFlags: onlybuild:libvorbis
@@ -2306,6 +2294,7 @@
BuildFlags: onlybuild:libxml2
BuildFlags: onlybuild:libxml2:python
BuildFlags: onlybuild:libxmlb
+BuildFlags: onlybuild:libxmp
BuildFlags: onlybuild:libxshmfence
BuildFlags: onlybuild:libxslt
BuildFlags: onlybuild:libyaml
@@ -2358,12 +2347,12 @@
BuildFlags: onlybuild:metis:serial
BuildFlags: onlybuild:mingw32-binutils:mingw32-cross-binutils
BuildFlags: onlybuild:mingw32-cross-cmake
-BuildFlags: onlybuild:mingw32-cross-gcc
-BuildFlags: onlybuild:mingw32-cross-gcc-bootstrap
-BuildFlags: onlybuild:mingw32-cross-pkgconf
BuildFlags: onlybuild:mingw32-cross-wine
BuildFlags: onlybuild:mingw32-filesystem
+BuildFlags: onlybuild:mingw32-gcc:mingw32-cross-gcc
+BuildFlags: onlybuild:mingw32-gcc:mingw32-cross-gcc-bootstrap
BuildFlags: onlybuild:mingw32-headers
+BuildFlags: onlybuild:mingw32-pkgconf:mingw32-cross-pkgconf
BuildFlags: onlybuild:mingw32-runtime
BuildFlags: onlybuild:mingw32-winpthreads
BuildFlags: onlybuild:mingw32-zlib
@@ -2402,7 +2391,7 @@
BuildFlags: onlybuild:ninja
BuildFlags: onlybuild:nlohmann_json
BuildFlags: onlybuild:nodejs-common
-BuildFlags: onlybuild:nodejs19
+BuildFlags: onlybuild:nodejs20
BuildFlags: onlybuild:npth
BuildFlags: onlybuild:nss-mdns
BuildFlags: onlybuild:nss-shared-helper
@@ -2420,6 +2409,7 @@
BuildFlags: onlybuild:openblas:serial
BuildFlags: onlybuild:opencc
BuildFlags: onlybuild:opencl-headers
+BuildFlags: onlybuild:opencore-amr
BuildFlags: onlybuild:openexr
BuildFlags: onlybuild:openjade
BuildFlags: onlybuild:openjpeg2
@@ -2434,8 +2424,8 @@
BuildFlags: onlybuild:openssl-1_1
BuildFlags: onlybuild:openssl-3
BuildFlags: onlybuild:openvswitch
-BuildFlags: onlybuild:opie
BuildFlags: onlybuild:opus
+BuildFlags: onlybuild:opusfile
BuildFlags: onlybuild:orc
BuildFlags: onlybuild:oxygen-gtk2
BuildFlags: onlybuild:p11-kit
@@ -2805,8 +2795,6 @@
BuildFlags: onlybuild:python-atspi
BuildFlags: onlybuild:python-attrs
BuildFlags: onlybuild:python-backports.entry_points_selectable
-BuildFlags: onlybuild:python-backports.zoneinfo
-BuildFlags: onlybuild:python-base
BuildFlags: onlybuild:python-bcrypt
BuildFlags: onlybuild:python-beniget
BuildFlags: onlybuild:python-betamax
@@ -2817,6 +2805,7 @@
BuildFlags: onlybuild:python-brotlipy
BuildFlags: onlybuild:python-build
BuildFlags: onlybuild:python-cairocffi
+BuildFlags: onlybuild:python-calver
BuildFlags: onlybuild:python-certifi
BuildFlags: onlybuild:python-cffi
BuildFlags: onlybuild:python-chardet
@@ -2829,6 +2818,7 @@
BuildFlags: onlybuild:python-construct
BuildFlags: onlybuild:python-contextvars
BuildFlags: onlybuild:python-contourpy
+BuildFlags: onlybuild:python-cookies
BuildFlags: onlybuild:python-coverage
BuildFlags: onlybuild:python-cppy
BuildFlags: onlybuild:python-cryptography
@@ -2856,6 +2846,7 @@
BuildFlags: onlybuild:python-fixtures
BuildFlags: onlybuild:python-flake8
BuildFlags: onlybuild:python-flaky
+BuildFlags: onlybuild:python-flit
BuildFlags: onlybuild:python-flit-core
BuildFlags: onlybuild:python-flit-core:primary
BuildFlags: onlybuild:python-flit-scm
@@ -2907,6 +2898,7 @@
BuildFlags: onlybuild:python-isoduration
BuildFlags: onlybuild:python-itsdangerous
BuildFlags: onlybuild:python-jaraco.classes
+BuildFlags: onlybuild:python-jaraco.context
BuildFlags: onlybuild:python-jaraco.envs
BuildFlags: onlybuild:python-jaraco.functools
BuildFlags: onlybuild:python-jaraco.packaging
@@ -2923,12 +2915,14 @@
BuildFlags: onlybuild:python-libcst
BuildFlags: onlybuild:python-libevdev
BuildFlags: onlybuild:python-linecache2
+BuildFlags: onlybuild:python-linkify-it-py
BuildFlags: onlybuild:python-lupa
BuildFlags: onlybuild:python-lxml
-BuildFlags: onlybuild:python-magic
+BuildFlags: onlybuild:python-markdown-it-py
BuildFlags: onlybuild:python-matplotlib
BuildFlags: onlybuild:python-maxminddb
BuildFlags: onlybuild:python-mccabe
+BuildFlags: onlybuild:python-mdurl
BuildFlags: onlybuild:python-meson-python
BuildFlags: onlybuild:python-mocket
BuildFlags: onlybuild:python-more-itertools
@@ -2953,7 +2947,6 @@
BuildFlags: onlybuild:python-pathspec
BuildFlags: onlybuild:python-pbr
BuildFlags: onlybuild:python-pefile
-BuildFlags: onlybuild:python-pep517
BuildFlags: onlybuild:python-pexpect
BuildFlags: onlybuild:python-pip
BuildFlags: onlybuild:python-pkginfo
@@ -3007,12 +3000,15 @@
BuildFlags: onlybuild:python-pytest-asyncio
BuildFlags: onlybuild:python-pytest-benchmark
BuildFlags: onlybuild:python-pytest-cov
+BuildFlags: onlybuild:python-pytest-datadir
BuildFlags: onlybuild:python-pytest-django
BuildFlags: onlybuild:python-pytest-expect
BuildFlags: onlybuild:python-pytest-forked
BuildFlags: onlybuild:python-pytest-freezegun
BuildFlags: onlybuild:python-pytest-httpserver
+BuildFlags: onlybuild:python-pytest-localserver
BuildFlags: onlybuild:python-pytest-mock
+BuildFlags: onlybuild:python-pytest-regressions
BuildFlags: onlybuild:python-pytest-relaxed
BuildFlags: onlybuild:python-pytest-rerunfailures
BuildFlags: onlybuild:python-pytest-subtests
@@ -3043,10 +3039,12 @@
BuildFlags: onlybuild:python-requests-gssapi
BuildFlags: onlybuild:python-requests-mock
BuildFlags: onlybuild:python-requests-toolbelt
+BuildFlags: onlybuild:python-responses
BuildFlags: onlybuild:python-rfc3339-validator
BuildFlags: onlybuild:python-rfc3986
BuildFlags: onlybuild:python-rfc3986-validator
BuildFlags: onlybuild:python-rfc3987
+BuildFlags: onlybuild:python-rich
BuildFlags: onlybuild:python-rpm
BuildFlags: onlybuild:python-rpm-macros
BuildFlags: onlybuild:python-rpm-packaging
@@ -3078,6 +3076,7 @@
BuildFlags: onlybuild:python-sphinxcontrib-applehelp
BuildFlags: onlybuild:python-sphinxcontrib-devhelp
BuildFlags: onlybuild:python-sphinxcontrib-htmlhelp
+BuildFlags: onlybuild:python-sphinxcontrib-jquery
BuildFlags: onlybuild:python-sphinxcontrib-jsmath
BuildFlags: onlybuild:python-sphinxcontrib-qthelp
BuildFlags: onlybuild:python-sphinxcontrib-serializinghtml
@@ -3105,6 +3104,7 @@
BuildFlags: onlybuild:python-tqdm
BuildFlags: onlybuild:python-traceback2
BuildFlags: onlybuild:python-trio
+BuildFlags: onlybuild:python-trove-classifiers
BuildFlags: onlybuild:python-trustme
BuildFlags: onlybuild:python-twine
BuildFlags: onlybuild:python-typing-inspect
@@ -3112,8 +3112,10 @@
BuildFlags: onlybuild:python-typogrify
BuildFlags: onlybuild:python-tzlocal
BuildFlags: onlybuild:python-u-msgpack-python
+BuildFlags: onlybuild:python-uc-micro-py
BuildFlags: onlybuild:python-uri-template
BuildFlags: onlybuild:python-urllib3
+BuildFlags: onlybuild:python-urllib3_1
BuildFlags: onlybuild:python-uvloop
BuildFlags: onlybuild:python-virtualenv
BuildFlags: onlybuild:python-wcag-contrast-ratio
@@ -3144,6 +3146,7 @@
BuildFlags: onlybuild:python38:base
BuildFlags: onlybuild:python39
BuildFlags: onlybuild:python39:base
+BuildFlags: onlybuild:python:python-base
BuildFlags: onlybuild:qca:qt5
BuildFlags: onlybuild:qemu
BuildFlags: onlybuild:qhull
@@ -3176,7 +3179,6 @@
BuildFlags: onlybuild:ruby
BuildFlags: onlybuild:ruby-bundled-gems-rpmhelper
BuildFlags: onlybuild:ruby-common
-BuildFlags: onlybuild:ruby3.1
BuildFlags: onlybuild:ruby3.2
BuildFlags: onlybuild:rubygem-asciidoctor
BuildFlags: onlybuild:rubygem-gem2rpm
@@ -3218,6 +3220,7 @@
BuildFlags: onlybuild:signify
BuildFlags: onlybuild:slang
BuildFlags: onlybuild:snappy
+BuildFlags: onlybuild:snobol4
BuildFlags: onlybuild:socat
BuildFlags: onlybuild:sord
BuildFlags: onlybuild:soundtouch
@@ -3251,6 +3254,7 @@
BuildFlags: onlybuild:superlu:serial
BuildFlags: onlybuild:suse-module-tools
BuildFlags: onlybuild:swig
+BuildFlags: onlybuild:swtpm
BuildFlags: onlybuild:sysprof
BuildFlags: onlybuild:sysstat
BuildFlags: onlybuild:system-user-mktex
@@ -3263,8 +3267,8 @@
BuildFlags: onlybuild:systemd-rpm-macros
BuildFlags: onlybuild:systemd:mini
BuildFlags: onlybuild:systemtap
-BuildFlags: onlybuild:systemtap-dtrace
-BuildFlags: onlybuild:systemtap-headers
+BuildFlags: onlybuild:systemtap:systemtap-dtrace
+BuildFlags: onlybuild:systemtap:systemtap-headers
BuildFlags: onlybuild:sysuser-tools
BuildFlags: onlybuild:sysvinit
BuildFlags: onlybuild:t1utils
@@ -3337,7 +3341,6 @@
BuildFlags: onlybuild:unifdef
BuildFlags: onlybuild:unixODBC
BuildFlags: onlybuild:unzip
-BuildFlags: onlybuild:update-alternatives
BuildFlags: onlybuild:update-bootloader-rpm-macros
BuildFlags: onlybuild:update-desktop-files
BuildFlags: onlybuild:upower
@@ -3364,10 +3367,10 @@
BuildFlags: onlybuild:vulkan-headers
BuildFlags: onlybuild:vulkan-loader
BuildFlags: onlybuild:vulkan-tools
-BuildFlags: onlybuild:libshout
-BuildFlags: onlybuild:wavpack
BuildFlags: onlybuild:w3m
BuildFlags: onlybuild:waf
+BuildFlags: onlybuild:waffle
+BuildFlags: onlybuild:wavpack
BuildFlags: onlybuild:wayland
BuildFlags: onlybuild:wayland-protocols
BuildFlags: onlybuild:webkit2gtk3:gtk3
@@ -3376,9 +3379,9 @@
BuildFlags: onlybuild:webrtc-audio-processing
BuildFlags: onlybuild:wget
BuildFlags: onlybuild:which
-BuildFlags: onlybuild:wine-nine-standalone
BuildFlags: onlybuild:wine
BuildFlags: onlybuild:wine-binfmt
+BuildFlags: onlybuild:wine-nine-standalone
BuildFlags: onlybuild:wine:staging
BuildFlags: onlybuild:winetricks
BuildFlags: onlybuild:wireless-tools
@@ -3443,13 +3446,10 @@
BuildFlags: onlybuild:yasm
BuildFlags: onlybuild:yelp-tools
BuildFlags: onlybuild:yelp-xsl
-BuildFlags: onlybuild:yodl
BuildFlags: onlybuild:zbar
BuildFlags: onlybuild:zchunk
BuildFlags: onlybuild:zenity
BuildFlags: onlybuild:zeromq
-BuildFlags: onlybuild:libdwarf
-BuildFlags: onlybuild:waffle
BuildFlags: onlybuild:zimg
BuildFlags: onlybuild:zip
BuildFlags: onlybuild:zlib
@@ -3461,11 +3461,6 @@
BuildFlags: onlybuild:zypper
BuildFlags: onlybuild:zziplib
-BuildFlags: onlybuild:a52dec
-BuildFlags: onlybuild:libdvdread
-BuildFlags: onlybuild:libmpeg2
-BuildFlags: onlybuild:opencore-amr
-
%endif
%endif
@@ -3547,7 +3542,6 @@
Prefer: %{rb_default_ruby_suffix}-rubygem-mini_portile2
Prefer: %{rb_default_ruby_suffix}-rubygem-ronn
Prefer: %{rb_default_ruby_suffix}-rubygem-rspec
-Prefer: -ruby3.1-rubygem-rspec-3_5
Prefer: %{rb_default_ruby_suffix}-rubygem-ruby-dbus
Prefer: %{rb_default_ruby_suffix}-rubygem-sass
Prefer: %{rb_default_ruby_suffix}-rubygem-sass-rails
@@ -3753,6 +3747,7 @@
# The following shlibs have the latest version built from GCC 7 sources
%product_libs_gcc_ver_libgfortran4 7
%product_libs_gcc_ver_libasan4 7
+%product_libs_gcc_ver_libtsan0 7
%product_libs_gcc_ver_libubsan0 7
%product_libs_gcc_ver_libcilkrts5 7
%product_libs_gcc_ver_libgo11 7
@@ -3769,7 +3764,6 @@
%product_libs_gcc_ver_libgo16 10
# The following shlibs have the latest version built from GCC 11 sources
%product_libs_gcc_ver_libasan6 11
-%product_libs_gcc_ver_libtsan0 11
%product_libs_gcc_ver_libgo19 11
%product_libs_gcc_ver_libgphobos2 11
%product_libs_gcc_ver_libgdruntime2 11
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/obs-build-20230502/create_container_package_list
new/obs-build-20230527/create_container_package_list
--- old/obs-build-20230502/create_container_package_list 2023-05-02
14:14:13.000000000 +0200
+++ new/obs-build-20230527/create_container_package_list 2023-05-27
07:39:11.000000000 +0200
@@ -1,9 +1,16 @@
#!/bin/bash
+qf='[%{NAME}|%{EPOCH}|%{VERSION}|%{RELEASE}|%{ARCH}|%{DISTURL}|%{LICENSE}\n]'
+
+if test "$1" = "--summaries" ; then
+ qf='[%{NAME}|%{EPOCH}|%{VERSION}|%{RELEASE}|%{ARCH}|%{SUMMARY}\n]'
+ shift
+fi
+
container="$1"
if test -z "$container" ; then
- echo "usage: create_container_package_list <container>"
+ echo "usage: create_container_package_list [--summaries] <container>"
exit 1
fi
if ! test -s "$container" ; then
@@ -25,8 +32,8 @@
rm -f $tmpdir/cont
umoci unpack --image $tmpdir/image:latest $tmpdir/unpack >/dev/null
if test -x "$tmpdir/unpack/rootfs/usr/bin/rpm" ; then
- chroot $tmpdir/unpack/rootfs rpm -qa --qf
'[%{NAME}|%{EPOCH}|%{VERSION}|%{RELEASE}|%{ARCH}|%{DISTURL}|%{LICENSE}\n]'
+ chroot $tmpdir/unpack/rootfs rpm -qa --qf "$qf"
else
- rpm --root "$tmpdir/unpack/rootfs" -qa --qf
'[%{NAME}|%{EPOCH}|%{VERSION}|%{RELEASE}|%{ARCH}|%{DISTURL}|%{LICENSE}\n]'
+ rpm --root "$tmpdir/unpack/rootfs" -qa --qf "$qf"
fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/obs-build-20230502/docs/cross_arch_build.adoc
new/obs-build-20230527/docs/cross_arch_build.adoc
--- old/obs-build-20230502/docs/cross_arch_build.adoc 2023-05-02
14:14:13.000000000 +0200
+++ new/obs-build-20230527/docs/cross_arch_build.adoc 2023-05-27
07:39:11.000000000 +0200
@@ -5,12 +5,12 @@
==== Terminology
-The terminiology for this is unfortunatly not standarised and tools have
conflicting
+The terminiology for this is unfortunatly not standarised and various tools
have conflicting
defintions.
We use the following
-===== Host: The architecture build environment which executes the for example
the compiler.
+===== Host Native: The architecture build environment which executes the for
example the compiler.
cmake is calling this HOST as well (eg. CMAKE_HOST_SYSTEM_PROCESSOR)
@@ -32,7 +32,7 @@
[width="15%"]
|=================================
-|build || host | target | -/-
+|pbuild|| host | target | -/-
|cmake || HOST | default | -/-
|GNU || build | host | target
|rpm || build | target | -/-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/obs-build-20230502/obs-docker-support
new/obs-build-20230527/obs-docker-support
--- old/obs-build-20230502/obs-docker-support 2023-05-02 14:14:13.000000000
+0200
+++ new/obs-build-20230527/obs-docker-support 2023-05-27 07:39:11.000000000
+0200
@@ -240,7 +240,10 @@
local n=$1
local ans
if test -x /usr/bin/rpm -o -x /bin/rpm ; then
- rpm -qa --qf
'%{NAME}|%{EPOCH}|%{VERSION}|%{RELEASE}|%{ARCH}|%{DISTURL}|%{LICENSE}\n' >
/tmp/packages
+ case $n in
+ *pkgsummaries) rpm -qa --qf
'%{NAME}|%{EPOCH}|%{VERSION}|%{RELEASE}|%{ARCH}|%{SUMMARY}\n' > /tmp/packages ;;
+ *) rpm -qa --qf
'%{NAME}|%{EPOCH}|%{VERSION}|%{RELEASE}|%{ARCH}|%{DISTURL}|%{LICENSE}\n' >
/tmp/packages ;;
+ esac
if test -n "$DATA_DIR" ; then
cp /tmp/packages "$DATA_DIR/UPLOAD/$n"
elif test -x /usr/bin/curl ; then
@@ -308,6 +311,7 @@
mv /var/lib/apt.obssave /var/lib/apt
fi
upload_packages packages
+ upload_packages pkgsummaries
rm -f /usr/local/sbin/obs-docker-support
;;
esac
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/obs-build-20230502/startdockerd
new/obs-build-20230527/startdockerd
--- old/obs-build-20230502/startdockerd 2023-05-02 14:14:13.000000000 +0200
+++ new/obs-build-20230527/startdockerd 2023-05-27 07:39:11.000000000 +0200
@@ -145,9 +145,9 @@
mount --rbind /sys/fs/cgroup "$BUILD_ROOT/sys/fs/cgroup"
mount --make-rslave "$BUILD_ROOT/sys/fs/cgroup"
export DOCKER_RAMDISK=true
-elif ! test -e /sys/fs/cgroup/unified -o -e /sys/fs/cgroup/cpu.stat ; then
- # workaround for kernel-obs-build bsc#1198484
- mount -t cgroup cgroup /sys/fs/cgroup -o devices
+elif ! [ -e /sys/fs/cgroup/unified ] && ! [ -e /sys/fs/cgroup/cpu.stat ] && !
[ -e /sys/fs/cgroup/cpuset ]; then
+ # workaround for kernel-obs-build bsc#1198484
+ mount -t cgroup cgroup /sys/fs/cgroup -o devices,cpuset
fi
# setup mounts
