From 66b557beafefba475a3b9a89065add56c73c0029 Mon Sep 17 00:00:00 2001 From: Bernhard M. Wiedemann Date: Feb 04 2021 11:30:49 +0000 Subject: update 2021-02-04 11:30 --- diff --git a/_attribute b/_attribute index 6bf2d26..c7034d3 100644 --- a/_attribute +++ b/_attribute @@ -31,7 +31,7 @@ boo#1162853: '20200312' boo#1163655: '20200218' boo#1163766: '20200414' - boo#1164313: '20210202' + boo#1164313: '20210203' boo#1166657: '20200405' boo#1167245: '20200327' boo#1167332: '20200319' @@ -75,7 +75,7 @@ boo#1174071: '20200714' boo#1174424: '20200729' boo#1174499: '20200728' - boo#1174680: '20210202' + boo#1174680: '20210203' boo#1174797: '20200805' boo#1174857: '20201215' boo#1175108: '20200831' @@ -93,7 +93,7 @@ boo#1176383: '20201117' boo#1176450: '20201009' boo#1176549: '20200917' - boo#1176553: '20210202' + boo#1176553: '20210203' boo#1176554: '20200916' boo#1176701: '20201014' boo#1176709: '20201105' @@ -103,20 +103,20 @@ boo#1176841: '20201021' boo#1176894: '20200923' boo#1177402: '20201009' - boo#1177461: '20210202' - boo#1177462: '20210202' + boo#1177461: '20210203' + boo#1177462: '20210203' boo#117751: '20201114' - boo#1177517: '20210202' + boo#1177517: '20210203' boo#1177779: '20201026' boo#1177904: '20201022' boo#1177923: '20201209' boo#1178050: '20201030' boo#1178096: '20201106' boo#1178451: '20201123' - boo#1178453: '20210202' + boo#1178453: '20210203' boo#1178527: '20210131' boo#1178534: '20201108' - boo#1179003: '20210202' + boo#1179003: '20210203' boo#1179013: '20201119' boo#1179033: '20201124' boo#1179196: '20201127' @@ -124,14 +124,14 @@ boo#1180048: '20201216' boo#1180259: '20201227' boo#1180284: '20210122' - boo#1180312: '20210202' - boo#1180316: '20210202' + boo#1180312: '20210203' + boo#1180316: '20210203' boo#1180317: '20210103' boo#1180358: '20210202' boo#1180740: '20210115' - boo#1180754: '20210202' + boo#1180754: '20210203' boo#1180853: '20210111' - boo#1181038: '20210202' + boo#1181038: '20210203' boo#1181497: '20210127' bsc#1158994: '20200323' bsc#1159185: '20200103' @@ -140,7 +140,7 @@ bsc#1174539: '20200909' bsc#1177675: '20201030' bsc#1177982: '20201030' - bsc#1179395: '20210202' + bsc#1179395: '20210203' bsc#1179416: '20201129' bsc#1179417: '20201129' gh#os-autoinst/os-autoinst-distri-opensuse#10856: '20200825' @@ -207,7 +207,7 @@ poo#66331: '20200710' poo#66373: '20200502' poo#66580: '20200627' - poo#66784: '20210202' + poo#66784: '20210203' poo#66967: '20200802' poo#67183: '20200622' poo#67216: '20200526' @@ -245,13 +245,13 @@ poo#71740: '20201024' poo#71782: '20201015' poo#71929: '20201103' - poo#71932: '20210202' + poo#71932: '20210203' poo#73102: '20201019' poo#73213: '20201011' poo#73600: '20201107' poo#73603: '20201022' poo#73624: '20201109' - poo#75247: '20210202' + poo#75247: '20210203' poo#75313: '20201105' poo#76861: '20201202' poo#76864: '20201207' @@ -261,21 +261,21 @@ poo#78007: '20210106' poo#78091: '20201205' poo#78097: '20201202' - poo#78536: '20210202' - poo#78538: '20210202' + poo#78536: '20210203' + poo#78538: '20210203' poo#80082: '20201201' poo#80102: '20201127' - poo#80628: '20210202' - poo#80966: '20210202' + poo#80628: '20210203' + poo#80966: '20210203' poo#81036: '20201217' poo#81256: '20210118' - poo#81382: '20210202' + poo#81382: '20210203' poo#87680: '20210122' poo#87692: '20210201' poo#87844: '20210115' - poo#88073: '20210201' + poo#88073: '20210203' poo#88107: '20210128' - poo#88438: '20210202' + poo#88438: '20210203' @@ -299,7 +299,7 @@ pkglistgen-scopes = target rings # 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 -repo_checker-allowed-in-cycles = acl,attr,audit,autoconf,automake,bc,binutils,bison,bzip2,cpio,cracklib,dejagnu,dwz,e2fsprogs,ed,elfutils,expat,expect,fdupes,file,findutils,flex,gawk,gcc,gcc9,gcc10,gdbm,gettext-runtime-mini,glibc,glibc:i686,gmp,gpm,gzip,help2man,isl,keyutils,krb5-mini,libcap,libcap-ng,libdb-4_8,libeconf,libffi,libgcrypt,libgpg-error,libnsl,libnss_usrfiles,libseccomp,libselinux,libsemanage,libsepol,libtirpc,libtool,libustr,libverto,libxcrypt,libzio,linux-glibc-devel,lua-macros,lua53,lua54,m4,make,makedepend,meson,mpc,mpfr,ncurses,netcfg,ninja,openssl,openssl-1_1,pam,patch,pcre,perl,perl-Text-Unidecode,perl-gettext,permissions,pkg-config,pkgconf,popt,python-rpm-macros,python3:base,python38:base,python3-base,readline,rpm,screen,shadow,system-user-root,system-users,systemd-rpm-macros,systemtap-headers,sysuser-tools,tcl,tcpd,texinfo,timezone,update-alternatives,utempter,util-linux,which,xz,zlib,zstd,tclap +repo_checker-allowed-in-cycles = acl,attr,audit,autoconf,automake,bc,binutils,bison,bzip2,cpio,cracklib,dejagnu,dwz,e2fsprogs,ed,elfutils,expat,expect,fdupes,file,findutils,flex,gawk,gcc,gcc10,gcc11,gdbm,gettext-runtime-mini,glibc,glibc:i686,gmp,gpm,gzip,help2man,isl,keyutils,krb5-mini,libcap,libcap-ng,libdb-4_8,libeconf,libffi,libgcrypt,libgpg-error,libnsl,libnss_usrfiles,libseccomp,libselinux,libsemanage,libsepol,libtirpc,libtool,libustr,libverto,libxcrypt,libzio,linux-glibc-devel,lua-macros,lua53,lua54,m4,make,makedepend,meson,mpc,mpfr,ncurses,netcfg,ninja,openssl,openssl-1_1,pam,patch,pcre,perl,perl-Text-Unidecode,perl-gettext,permissions,pkg-config,pkgconf,popt,python-rpm-macros,python3:base,python38:base,python3-base,readline,rpm,screen,shadow,system-user-root,system-users,systemd-rpm-macros,systemtap-headers,sysuser-tools,tcl,tcpd,texinfo,timezone,update-alternatives,utempter,util-linux,which,xz,zlib,zstd,tclap staging-required-checks-adi = installcheck repo_checker-project-skip = True @@ -569,7 +569,7 @@ set_snapshot_number: True failed: '' published: '20210202' publishing: '20210202' -testing: '20210202' +testing: '20210203' diff --git a/_config b/_config index 296a81a..447b786 100644 --- a/_config +++ b/_config @@ -1373,8 +1373,12 @@ Prefer: %{rb_default_ruby_suffix}-rubygem-yast-rake %define _without_python2 1 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_python36:python36} %{?!skip_python38:python38}} -%skip_python2 1 +%add_python() %{expand:%%define pythons %1 %pythons} + %_without_python2 1 # prjconf definitions for python-rpm-macros @@ -1385,8 +1389,7 @@ Macros: # pseudo-undefine for obs: reset for the next expansion within the next call of python_module %python_module_iter_STOP %global python %%%%python %python_module() %{?!python_module_lua:%{expand:%%define args %{**}} %{expand:%%{python_module_iter -a %{pythons} STOP}}}%{?python_module_lua:%python_module_lua %{**}} - -%add_python() %{expand:%%define pythons %pythons %1} +## PYTHON MACROS END :Macros # END PYTHON STUFF diff --git a/_staging_workflow b/_staging_workflow index 3c5eef5..52a122e 100644 --- a/_staging_workflow +++ b/_staging_workflow @@ -126,10 +126,16 @@ - + + + + + + +