From 57fad926c1490bc2a4a98291a23cb04cfe212f874593623eca7882b54e3a9d97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Wed, 4 Feb 2026 16:55:01 +0100 Subject: [PATCH 1/3] Add rpmlint-mini to have a package from base system --- .gitmodules | 4 ++++ pkg/r/rpmlint-mini | 1 + 2 files changed, 5 insertions(+) create mode 160000 pkg/r/rpmlint-mini diff --git a/.gitmodules b/.gitmodules index a19a664..9185fce 100644 --- a/.gitmodules +++ b/.gitmodules @@ -23,3 +23,7 @@ path = pkgs/p/python-orangebox url = ../../pool/python-orangebox branch = factory +[submodule "pkg/r/rpmlint-mini"] + path = pkg/r/rpmlint-mini + url = ../../pool/rpmlint + branch = factory diff --git a/pkg/r/rpmlint-mini b/pkg/r/rpmlint-mini new file mode 160000 index 0000000..d848be0 --- /dev/null +++ b/pkg/r/rpmlint-mini @@ -0,0 +1 @@ +Subproject commit d848be02722f3d3f09cb1dc412b9694b17db25bc7baeaf20e5c937e23fd30957 -- 2.51.1 From 99a3807654480e1225fe039e8eac7f4022f56e5ebc2a91fd5a091a16d97ced2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Wed, 4 Feb 2026 16:58:18 +0100 Subject: [PATCH 2/3] Update _manifest file --- .gitmodules | 4 ++-- _manifest | 1 + {pkg => pkgs}/r/rpmlint-mini | 0 3 files changed, 3 insertions(+), 2 deletions(-) rename {pkg => pkgs}/r/rpmlint-mini (100%) diff --git a/.gitmodules b/.gitmodules index 9185fce..522168a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -23,7 +23,7 @@ path = pkgs/p/python-orangebox url = ../../pool/python-orangebox branch = factory -[submodule "pkg/r/rpmlint-mini"] - path = pkg/r/rpmlint-mini +[submodule "pkgs/r/rpmlint-mini"] + path = pkgs/r/rpmlint-mini url = ../../pool/rpmlint branch = factory diff --git a/_manifest b/_manifest index 4bde82d..f46e91a 100644 --- a/_manifest +++ b/_manifest @@ -3,4 +3,5 @@ subdirectories: - pkgs/c - pkgs/p + - pkgs/r diff --git a/pkg/r/rpmlint-mini b/pkgs/r/rpmlint-mini similarity index 100% rename from pkg/r/rpmlint-mini rename to pkgs/r/rpmlint-mini -- 2.51.1 From 903e73a73e300b66979ace1391eea123b95fa2bc5b4e2d84453c6c96a47e27a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Tue, 3 Mar 2026 16:34:36 +0100 Subject: [PATCH 3/3] Sync build config and apply i586 onlybuild also for :PullRequest --- _config | 81 ++++++++++++++++++++++++++++++++++++--------------------- 1 file changed, 51 insertions(+), 30 deletions(-) diff --git a/_config b/_config index 18f71c1..210e160 100644 --- a/_config +++ b/_config @@ -1,4 +1,4 @@ -# . +# ... Prefer: -yast2-schema-micro -yast2-schema %define gcc_version 15 @@ -8,7 +8,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:20260105 +ExpandFlags: macroserial:20260227 ExpandFlags: kiwi-nobasepackages ExpandFlags: docker-nobasepackages @@ -60,7 +60,7 @@ RepoType: rpm-md:sha512:filelists-ext Patterntype: none Prefer: openSUSE-release-ftp Tumbleweed-release-ftp Support: release-compare -# Support: baseiso-containment + Support: baseiso-containment # Required: containment-tik-img-to-rpm # BuildFlags: obsgendiff %endif @@ -79,6 +79,18 @@ RepoType: rpm-md:sha512:filelists-ext %endif %endif +%if "%_repository" == "mkosi" + Type: mkosi + Repotype: checksumsfile + #Repotype: checksumsfile:rawsig + Patterntype: none + Required: systemd udev policycoreutils python3-pefile mtools qemu-img + # additional for raw-disk-image-install UKI + Required: openssl systemd-ukify gptfdisk + # For UKI signing in OBS + Required: mozilla-nss-tools pesign jq +%endif + %if "%_project" == "openSUSE:Factory" || "%_project" == "openSUSE:Factory:NonFree" || "%_project" == "openSUSE:Factory:PowerPC" || "%_project" == "openSUSE:Factory:Rebuild" || "%_project" == "openSUSE:Factory:zSystems" Repotype: none Macros: @@ -297,7 +309,7 @@ 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/chardetect python311-chardet python312-chardet python313-chardet +FileProvides: /usr/bin/chardetect python311-chardet python314-chardet python313-chardet FileProvides: /usr/bin/chfn shadow FileProvides: /usr/bin/chgrp busybox-coreutils coreutils coreutils-single FileProvides: /usr/bin/chmod busybox-coreutils coreutils coreutils-single @@ -337,7 +349,7 @@ FileProvides: /usr/bin/ed busybox-ed ed FileProvides: /usr/bin/edit-xml-catalog sgml-skel FileProvides: /usr/bin/enc2xs perl FileProvides: /usr/bin/env busybox-coreutils coreutils coreutils-single -FileProvides: /usr/bin/eremaeactl python311-django-eremaea2 python312-django-eremaea2 python313-django-eremaea2 +FileProvides: /usr/bin/eremaeactl python311-django-eremaea2 python314-django-eremaea2 python313-django-eremaea2 FileProvides: /usr/bin/escript erlang FileProvides: /usr/bin/eu-strip elfutils FileProvides: /usr/bin/expand busybox-coreutils coreutils coreutils-single @@ -482,7 +494,7 @@ FileProvides: /usr/bin/ruby.ruby4.0 ruby4.0 FileProvides: /usr/bin/runawk runawk FileProvides: /usr/bin/sbcl sbcl-bin FileProvides: /usr/bin/scheme-srfi-7 scheme48 -FileProvides: /usr/bin/scour python311-scour python312-scour python313-scour +FileProvides: /usr/bin/scour python311-scour python314-scour python313-scour FileProvides: /usr/bin/sed busybox-sed sed FileProvides: /usr/bin/sgml-register-catalog sgml-skel FileProvides: /usr/bin/sh bash-sh busybox-sh dash-sh zsh-sh @@ -646,8 +658,8 @@ Prefer: -sequoia-octopus-librnp # gdm-systems is the standalong systemd service, but for now we stick to the xdm integration Prefer: -gdm-systemd -# have choice for uv needed by python310-hatch: python310-uv python311-uv python312-uv uv, have choice for uv needed by python312-hatch: python310-uv python311-uv python312-uv uv, have choice for uv needed by python311-hatch: python310-uv python311-uv python312-uv uv -Prefer: -python312-uv -python313-uv +# have choice for uv needed by python310-hatch: python310-uv python311-uv python312-uv uv +Prefer: -python313-uv -python314-uv # unresolvable: have choice for (exfatprogs or exfat-utils) needed by gnome-disk-utility: exfat-utils exfatprogs Prefer: -exfat-utils @@ -656,14 +668,19 @@ Prefer: -exfat-utils Prefer: -mt-st schily-mt # have choice for python3-numpy-devel: python311-numpy-devel python311-numpy1-devel -Prefer: -python311-numpy1-devel -python312-numpy1-devel -python313-numpy1-devel -Prefer: -python311-numpy1 -python312-numpy1 -python313-numpy1 +Prefer: -python311-numpy1-devel -python314-numpy1-devel -python313-numpy1-devel +Prefer: -python311-numpy1 -python314-numpy1 -python313-numpy1 + +# have choice for python311-click >= 7.0 needed by python311-mkdocs: python311-click python311-click81 +Prefer: -python311-click81 +Prefer: -python314-click81 +Prefer: -python313-click81 # have choice for dbus(org.freedesktop.secrets) needed by NetworkManager-applet: gnome-keyring oo7-daemon Prefer: -oo7-daemon # have choice for python3-PyPDF2 >= 2.1.1: python310-pypdf python311-PyPDF2 python311-pypdf python312-pypdf -Prefer: -python311-pypdf -python312-pypdf -python313-pypdf +Prefer: -python311-pypdf -python314-pypdf -python313-pypdf # unresolvable: have choice for translate-toolkit >= 3.14.4: python311-translate-toolkit python311-translate-toolkit-man Prefer: -python311-translate-toolkit-man @@ -692,12 +709,12 @@ Prefer: -qt6-wayland-integration # have choice for python311-anyio needed by python311-httpx: python311-anyio python311-anyio3, have choice for (python311-anyio >= 3 with python311-anyio < 5) needed by python311-httpcore: python311-anyio python311-anyio3 Prefer: -python311-anyio3 -Prefer: -python312-anyio3 +Prefer: -python314-anyio3 Prefer: -python313-anyio3 # have choice for python311-django >= 1.11: python311-Django python311-Django4, have choice for python311-Django needed by python311-pytest-django: python311-Django python311-Django4 Prefer: -python311-Django4 -Prefer: -python312-Django4 +Prefer: -python314-Django4 Prefer: -python313-Django4 # have choice for dbus-broker-restart-behavior = 35 needed by dbus-broker: dbus-broker-allow-restart dbus-broker-block-restart @@ -808,6 +825,9 @@ Prefer: -python313-Django6 # have choice for zig-rpm-macros: zig-rpm-macros0.14 zig-rpm-macros0.15 Prefer: -zig-rpm-macros0.14 +# have choice for libopencv_highgui.so.413()(64bit): libopencv_highgui413 libopencv_highgui413-gtk3 libopencv_highgui413-qt6 +Prefer: libopencv_highgui413 + #--- %if "%_repository" != "ports" @@ -1064,7 +1084,7 @@ Prefer: cmake-mini # python-pip inside OBS never connects to the net, so we don't use certs Ignore: python311-pip:ca-certificates -Ignore: python312-pip:ca-certificates +Ignore: python314-pip:ca-certificates Ignore: python313-pip:ca-certificates Prefer: -suse-build-key @@ -1084,37 +1104,37 @@ Prefer: -Catch2-2-devel Prefer: -urw-base35-fonts # Python3 exists in multiple versions - we currently favor 3.11 (our default): -Prefer: -python312-txt2tags -python313-txt2tags +Prefer: -python314-txt2tags -python313-txt2tags # unresolvable: have choice for libcontainers-policy >= 20230214 needed by libcontainers-common: libcontainers-default-policy libcontainers-openSUSE-policy Prefer: -libcontainers-default-policy # have choice for python-mistune after rename to python-mistune2 Prefer: -python311-mistune -Prefer: -python312-mistune +Prefer: -python314-mistune Prefer: -python313-mistune Prefer: -protobuf21-devel Prefer: -python311-urllib3_1 -python312-urllib3_1 -python313-urllib3_1 # have choice for python3-magic: python38-magic python38-python-magic -Prefer: -python312-magic -python313-magic +Prefer: -python314-magic -python313-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: -python311-Cython0 -python312-Cython0 -python313-Cython0 +Prefer: -python311-Cython0 -python314-Cython0 -python313-Cython0 # have choice for ntp-daemon: chrony ntp ntpsec Prefer: chrony # have choice for python-sqlalchemy >= 1.4: python-SQLAlchemy python-SQLAlchemy1 -Prefer: -python311-SQLAlchemy1 -python312-SQLAlchemy1 -python313-SQLAlchemy1 +Prefer: -python311-SQLAlchemy1 -python314-SQLAlchemy1 -python313-SQLAlchemy1 # have choice for (python36-qt5 or python36-PyQt6) needed by python36-pytest-qt Prefer: -python311-PyQt6 -Prefer: -python312-PyQt6 +Prefer: -python314-PyQt6 Prefer: -python313-PyQt6 # man and mandoc provide man; mandoc claims to be lightweight, but it was never discussed to be the new default @@ -1137,7 +1157,7 @@ Prefer: -budgie-desktop # python-tornado exists in multiple versions, the meta-package python-tornado defines the system default Prefer: python311-tornado -Prefer: python312-tornado +Prefer: python314-tornado Prefer: python313-tornado # have choice for libopenblas.so.0()(64bit) needed by libopencv407: libopenblas_openmp0 libopenblas_pthreads0 libopenblas_serial0 @@ -1187,8 +1207,8 @@ Prefer: php8:php8-cli Prefer: -libomp15-devel -libomp18-devel -libomp19-devel -libomp20-devel # have choice for python3dist(jupyterlab) = 3.6.2 needed by jupyter-jupyterlab: python310-jupyterlab python311-jupyterlab python38-jupyterlab python39-jupyterlab -Prefer: -python312-nbclassic -python313-nbclassic -prefer: -python312-notebook -python313-notebook +Prefer: -python314-nbclassic -python313-nbclassic +prefer: -python314-notebook -python313-notebook # have choice for (sysvinit(network) or service(network)) needed by sysconfig: NetworkManager wicked-service Prefer: -NetworkManager @@ -1235,7 +1255,7 @@ Prefer: -nunit3-devel # have choice for python39-pytest-asyncio: python39-pytest-asyncio python39-pytest-asyncio0.21 Prefer: -python311-pytest-asyncio0.21 -Prefer: -python312-pytest-asyncio0.21 +Prefer: -python314-pytest-asyncio0.21 Prefer: -python313-pytest-asyncio0.21 # have choice for libsymspg.so.2()(64bit) needed by libAvogadro1: libsymspg2 python3-spglib @@ -1816,7 +1836,7 @@ Ignore: yui_backend Constraint: hardware:cpu:flag power8 %endif -%if "%{_project}" == "openSUSE:Factory" || "%{sub %_project 1 28}" == "openSUSE:Factory:Staging:adi" || "%{sub %_project 1 22}" == "openSUSE:Factory:Rings" || "%{_project}" == "openSUSE:Factory:Rebuild" +%if "%{_project}" == "openSUSE:Factory" || "%{sub %_project 1 28}" == "openSUSE:Factory:Staging:adi" || "%{sub %_project 1 22}" == "openSUSE:Factory:Rings" || "%{_project}" == "openSUSE:Factory:Rebuild" || "%{sub %_project 1 28}" == "openSUSE:Factory:PullRequest" # Generated by openSUSE-release-tools/cleanup_32bit.py %ifarch %ix86 @@ -2219,6 +2239,7 @@ BuildFlags: onlybuild:lcms2 BuildFlags: onlybuild:ldacBT BuildFlags: onlybuild:ldns BuildFlags: onlybuild:leancrypto +BuildFlags: onlybuild:lerc BuildFlags: onlybuild:less BuildFlags: onlybuild:libabigail BuildFlags: onlybuild:libaio @@ -2952,14 +2973,12 @@ BuildFlags: onlybuild:psutils BuildFlags: onlybuild:pthread-stubs BuildFlags: onlybuild:publicsuffix BuildFlags: onlybuild:pulseaudio -BuildFlags: onlybuild:python310 -BuildFlags: onlybuild:python310:base BuildFlags: onlybuild:python311 BuildFlags: onlybuild:python311:base -BuildFlags: onlybuild:python312 -BuildFlags: onlybuild:python312:base BuildFlags: onlybuild:python313 BuildFlags: onlybuild:python313:base +BuildFlags: onlybuild:python314 +BuildFlags: onlybuild:python314:base BuildFlags: onlybuild:python-abseil BuildFlags: onlybuild:python-aiodns BuildFlags: onlybuild:python-aiohappyeyeballs @@ -3070,6 +3089,7 @@ BuildFlags: onlybuild:python-kiwisolver BuildFlags: onlybuild:python-lark BuildFlags: onlybuild:python-libcst BuildFlags: onlybuild:python-libevdev +BuildFlags: onlybuild:python-librt BuildFlags: onlybuild:python-linkify-it-py BuildFlags: onlybuild:python-lxml BuildFlags: onlybuild:python-Mako @@ -3272,6 +3292,7 @@ BuildFlags: onlybuild:re2c BuildFlags: onlybuild:readline BuildFlags: onlybuild:regexp BuildFlags: onlybuild:reload4j +BuildFlags: onlybuild:renderdoc BuildFlags: onlybuild:rhash BuildFlags: onlybuild:rhino BuildFlags: onlybuild:rpcbind @@ -3675,7 +3696,7 @@ Macros: ## PYTHON MACROS BEGIN # order of %pythons is important: The last flavor overrides any operation on conflicting files and definitions during expansions, # making it the "default" in many cases --> keep the primary python3 provider at the end. -%pythons %{?!skip_python3:%{?!skip_python311:python311} %{?!skip_python312:python312} %{?!skip_python313:python313}} +%pythons %{?!skip_python3:%{?!skip_python311:python311} %{?!skip_python313:python313}} %add_python() %{expand:%%define pythons %1 %pythons} %_without_python2 1 -- 2.51.1