Merge pull request 'cleanup in python packages / sync with Factory' (#24) from fcrozat/SUSE_ALP_Standard:1.0 into 1.0
Reviewed-on: https://src.suse.de/products/SUSE_ALP_Standard/pulls/24
This commit is contained in:
Marcus Rückert
commit
14495b5a5d
90
_config
90
_config
@ -87,11 +87,27 @@ BuildFlags: excludebuild:meson:test
|
||||
BuildFlags: excludebuild:libappindicator:gtk2
|
||||
BuildFlags: excludebuild:pinentry:gui
|
||||
|
||||
# no cross-arch building
|
||||
BuildFlags: excludebuild:gcc13:cross-ppc64le-gcc13
|
||||
BuildFlags: excludebuild:gcc13:cross-s390x-gcc13
|
||||
|
||||
# only needed for old pythons
|
||||
BuildFlags: excludebuild:python-packaging
|
||||
BuildFlags: excludebuild:python-pandas:test-py310
|
||||
BuildFlags: excludebuild:python-pandas:test-py39
|
||||
BuildFlags: excludebuild:python-pythran:test-py310
|
||||
BuildFlags: excludebuild:python-pythran:test-py39
|
||||
|
||||
# missing packages just for multibuild tests
|
||||
BuildFlags: excludebuild:obs-service-tar_scm:test
|
||||
BuildFlags: excludebuild:python-SecretStorage:test
|
||||
BuildFlags: excludebuild:python-isort:test
|
||||
BuildFlags: excludebuild:virt-manager:test
|
||||
BuildFlags: excludebuild:python-pandas:test-py311
|
||||
|
||||
|
||||
# no 32bit on ALP
|
||||
BuildFlags: excludebuild:rpmlint:test
|
||||
%endif
|
||||
|
||||
%if "%_project" == "SUSE:ALP" || "%_project" == "SUSE:ALP:Workbench"|| "%_project" == "SUSE:ALP:Workbench:1.0"|| "%_project" == "SUSE:ALP:RISCV" || "%_project" == "SUSE:ALP:zSystems" || "%_project" == "SUSE:ALP:PowerPC"
|
||||
@ -516,7 +532,6 @@ Prefer: -sdbootutil-rpm-scriptlets
|
||||
# have choice for chromedriver needed by openQA-devel: chromedriver ungoogled-chromium-chromedriver
|
||||
Prefer: -ungoogled-chromium-chromedriver
|
||||
|
||||
|
||||
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
|
||||
@ -529,11 +544,6 @@ Prefer: libdb-4_8-devel
|
||||
VMinstall: util-linux libmount1 perl-base libdb-4_8 libblkid1 libuuid1 libsmartcols1 libcrypt1
|
||||
VMinstall: kernel-obs-build
|
||||
|
||||
# Add hostname so that OBS/build will have a chance to identify the hostname (instead of localhost)
|
||||
# build has alternative ways to inject hostname nowadays - removed 2022-03-23 - dimstar
|
||||
#Support: hostname
|
||||
#Prefer: -busybox-hostname
|
||||
|
||||
# Use the x86_64 kernel on i586 builds - boo#1178762 - Slow down in OBS since kernel 5.6.0 on 32bit
|
||||
ExportFilter: ^kernel-obs-build.*\.x86_64.rpm$ . i586
|
||||
# new: use kernel-obs-build from aarch64 for aarch64 armv6 and armv7
|
||||
@ -785,19 +795,22 @@ 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):
|
||||
# have choice for (ghostscript-fonts-std or urw-base35-fonts) needed by emacs-x11: ghostscript-fonts-std urw-base35-fonts
|
||||
Prefer: -urw-base35-fonts
|
||||
|
||||
# Python3 exists in multiple versions - we currently favor 3.11 (our default):
|
||||
Prefer: -python39
|
||||
Prefer: -python39-hotdoc
|
||||
Prefer: -python38-txt2tags -python39-txt2tags -python311-txt2tags
|
||||
Prefer: -python39-txt2tags -python310-txt2tags
|
||||
|
||||
# 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 -python38-Cython3
|
||||
|
||||
# have choice for ntp-daemon: chrony ntp ntpsec
|
||||
Prefer: chrony
|
||||
@ -805,10 +818,10 @@ Prefer: chrony
|
||||
Prefer: -procps4
|
||||
|
||||
# have choice for python39-sqlalchemy >= 1.4: python39-SQLAlchemy python39-SQLAlchemy1
|
||||
Prefer: -python39-SQLAlchemy1 -python310-SQLAlchemy1 -python311-SQLAlchemy1
|
||||
Prefer: -python39-SQLAlchemy1 -python310-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
|
||||
@ -825,13 +838,12 @@ Prefer: -kernel-vanilla
|
||||
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 html2text
|
||||
Prefer: -python38-html2text -python39-html2text -python310-html2text -python311-html2text
|
||||
Prefer: -python39-html2text -python310-html2text
|
||||
|
||||
# have choice for (gnome-session or budgie-desktop) needed by gnome-shell: budgie-desktop gnome-session
|
||||
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
|
||||
@ -847,18 +859,18 @@ Prefer: PackageKit-backend-zypp
|
||||
Prefer: libftdi-devel
|
||||
|
||||
# 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
|
||||
Prefer: -python39-sip6-devel -python310-sip6-devel -python311-sip6-devel
|
||||
Prefer: -python39-sip4 -python39-sip4-devel
|
||||
Prefer: -python310-sip4 -python310-sip4-devel
|
||||
Prefer: -python311-sip4 -python311-sip4-devel
|
||||
|
||||
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
|
||||
# have choice for python3-zeep >= 3.2.0: python311-softlayer-zeep python311-zeep
|
||||
Prefer: -python311-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
|
||||
@ -1272,7 +1284,7 @@ Prefer: -ruby3.1-rubygem-kramdown
|
||||
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
|
||||
@ -1617,39 +1629,6 @@ Macros:
|
||||
# IMPORTANT IMPORTANT IMPORTANT IMPORTANT IMPORTANT IMPORTANT
|
||||
#
|
||||
|
||||
### And now Ruby 2.7
|
||||
|
||||
%rubygemsruby27() rubygem(ruby:2.7.0:%{expand:%%rubygemsx%*} %{expand:%%{rubygems%*}}
|
||||
%rubygemsxruby27() %{expand:%%{rubygemsx%*}}
|
||||
|
||||
%rubyruby27() ruby2.7 %{expand:%%rubyx%*} %{expand:%%{ruby%*}}
|
||||
%rubyxruby27() %{expand:%%{rubyx%*}}
|
||||
|
||||
%rubydevelruby27() ruby2.7-devel %{expand:%%rubydevelx%*} %{expand:%%{rubydevel%*}}
|
||||
%rubydevelxruby27() %{expand:%%{rubydevelx%*}}
|
||||
|
||||
### And now Ruby 3.0
|
||||
|
||||
%rubygemsruby30() rubygem(ruby:3.0.0:%{expand:%%rubygemsx%*} %{expand:%%{rubygems%*}}
|
||||
%rubygemsxruby30() %{expand:%%{rubygemsx%*}}
|
||||
|
||||
%rubyruby30() ruby3.0 %{expand:%%rubyx%*} %{expand:%%{ruby%*}}
|
||||
%rubyxruby30() %{expand:%%{rubyx%*}}
|
||||
|
||||
%rubydevelruby30() ruby3.0-devel %{expand:%%rubydevelx%*} %{expand:%%{rubydevel%*}}
|
||||
%rubydevelxruby30() %{expand:%%{rubydevelx%*}}
|
||||
|
||||
### And now Ruby 3.1
|
||||
|
||||
%rubygemsruby31() rubygem(ruby:3.1.0:%{expand:%%rubygemsx%*} %{expand:%%{rubygems%*}}
|
||||
%rubygemsxruby31() %{expand:%%{rubygemsx%*}}
|
||||
|
||||
%rubyruby31() ruby3.1 %{expand:%%rubyx%*} %{expand:%%{ruby%*}}
|
||||
%rubyxruby31() %{expand:%%{rubyx%*}}
|
||||
|
||||
%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%*}}
|
||||
@ -1693,7 +1672,6 @@ Prefer: %{rb_default_ruby_suffix}-rubygem-inifile
|
||||
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
|
||||
@ -1707,7 +1685,6 @@ Prefer: %{rb_default_ruby_suffix}-rubygem-yast-rake
|
||||
%define primary_python python311
|
||||
%define skip_python2 1
|
||||
%define _without_python2 1
|
||||
%define skip_python38 1
|
||||
%define skip_python39 1
|
||||
%define skip_python310 1
|
||||
|
||||
@ -1715,11 +1692,10 @@ 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_python38:python38} %{?!skip_python39:python39} %{?!skip_python310:python310} %{?!skip_python311:python311}}
|
||||
%pythons %{?!skip_python3:%{?!skip_python39:python39} %{?!skip_python310:python310} %{?!skip_python311:python311}}
|
||||
%add_python() %{expand:%%define pythons %1 %pythons}
|
||||
|
||||
%_without_python2 1
|
||||
%skip_python38 1
|
||||
%skip_python39 1
|
||||
%skip_python310 1
|
||||
|
||||
@ -1736,7 +1712,7 @@ Macros:
|
||||
## PYTHON MACROS END
|
||||
:Macros
|
||||
|
||||
Prefer: %primary_python-packaging
|
||||
#Prefer: %primary_python-packaging
|
||||
|
||||
# END PYTHON STUFF
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user