diff --git a/_attribute b/_attribute index e94da91..0ec8886 100644 --- a/_attribute +++ b/_attribute @@ -55,7 +55,7 @@ boo#1171556: '20200511' boo#1171714: '20200602' boo#1171870: '20200517' - boo#1172013: '20201226' + boo#1172013: '20201227' boo#1172071: '20200523' boo#1172291: '20200528' boo#1172430: '20200810' @@ -75,7 +75,7 @@ boo#1174071: '20200714' boo#1174424: '20200729' boo#1174499: '20200728' - boo#1174680: '20201226' + boo#1174680: '20201227' boo#1174797: '20200805' boo#1174857: '20201215' boo#1175108: '20200831' @@ -93,7 +93,7 @@ boo#1176383: '20201117' boo#1176450: '20201009' boo#1176549: '20200917' - boo#1176553: '20201226' + boo#1176553: '20201227' boo#1176554: '20200916' boo#1176701: '20201014' boo#1176709: '20201105' @@ -106,28 +106,28 @@ boo#1177461: '20201226' boo#1177462: '20201226' boo#117751: '20201114' - boo#1177517: '20201226' + boo#1177517: '20201227' boo#1177779: '20201026' boo#1177904: '20201022' boo#1177923: '20201209' boo#1178050: '20201030' boo#1178096: '20201106' boo#1178451: '20201123' - boo#1178453: '20201226' - boo#1178527: '20201226' + boo#1178453: '20201227' + boo#1178527: '20201227' boo#1178534: '20201108' - boo#1179003: '20201226' + boo#1179003: '20201227' boo#1179013: '20201119' boo#1179033: '20201124' boo#1179196: '20201127' boo#1179395: '20201130' boo#1180048: '20201216' boo#1180259: '20201226' - boo#1180284: '20201224' - boo#1180312: '20201226' - boo#1180316: '20201226' - boo#1180317: '20201226' - boo#1180358: '20201226' + boo#1180284: '20201227' + boo#1180312: '20201227' + boo#1180316: '20201227' + boo#1180317: '20201227' + boo#1180358: '20201227' bsc#1158994: '20200323' bsc#1159185: '20200103' bsc#1170555: '20200427' @@ -135,7 +135,7 @@ bsc#1174539: '20200909' bsc#1177675: '20201030' bsc#1177982: '20201030' - bsc#1179395: '20201225' + bsc#1179395: '20201227' bsc#1179416: '20201129' bsc#1179417: '20201129' gh#os-autoinst/os-autoinst-distri-opensuse#10856: '20200825' @@ -174,7 +174,7 @@ poo#63415: '20200215' poo#63418: '20200218' poo#63421: '20200211' - poo#63454: '20201225' + poo#63454: '20201227' poo#63457: '20201224' poo#63775: '20200222' poo#63778: '20200301' @@ -239,28 +239,28 @@ poo#71740: '20201024' poo#71782: '20201015' poo#71929: '20201103' - poo#71932: '20201226' + poo#71932: '20201227' poo#73102: '20201019' poo#73213: '20201011' poo#73600: '20201107' poo#73603: '20201022' poo#73624: '20201109' - poo#75247: '20201226' + poo#75247: '20201227' poo#75313: '20201105' poo#76861: '20201202' poo#76864: '20201207' - poo#77095: '20201226' + poo#77095: '20201227' poo#77689: '20201117' poo#77830: '20201123' - poo#78007: '20201226' + poo#78007: '20201227' poo#78091: '20201205' poo#78097: '20201202' - poo#78536: '20201226' - poo#78538: '20201226' + poo#78536: '20201227' + poo#78538: '20201227' poo#80082: '20201201' poo#80102: '20201127' - poo#80628: '20201226' - poo#80966: '20201226' + poo#80628: '20201227' + poo#80966: '20201227' poo#81036: '20201217' @@ -305,7 +305,7 @@ bad-rpmlint-entries = suse-dbus-unauthorized-service suse-pam-unauthorized-modul s/openSUSE-/openSUSE-Staging:$LETTER-/ - 20201227 + 20201228 arch: x86_64 @@ -553,9 +553,9 @@ set_snapshot_number: True failed: '' -published: '20201225' -publishing: '20201225' -testing: '20201226' +published: '20201226' +publishing: '20201226' +testing: '20201227' diff --git a/_config b/_config index e6fd7a5..c5a49aa 100644 --- a/_config +++ b/_config @@ -397,6 +397,12 @@ Prefer: -suse-build-key Prefer: postfix # Give the worker any default apache2-MPM for apache2- chosing 'prefork' (alternatives are -event and -worker, dep-wise they are equal) +# cyrus-sasl and postfix both bring a -bdb flavor. De-prefer this flavor +Prefer: -cyrus-sasl-bdb-devel + +# Spamassassin requires wget or curl - we prefer curl, as its build dep chain seems cheaper +Prefer: spamassassin:curl + # Python3 exists in multiple versions - we currently favor 3.8 (our default): Prefer: -python36 -python39 Prefer: -python36-hotdoc @@ -1449,22 +1455,24 @@ Macros: %rb_default_ruby_suffix ruby2.7 %rb_default_ruby_abi ruby:2.7.0 -%rb_build_ruby_abis ruby:2.7.0 -%rb_build_versions ruby27 +%rb_build_ruby_abis ruby:2.7.0 ruby:3.0.0 +%rb_build_versions ruby27 ruby30 :Macros Macros: %_with_ruby27 1 +%_with_ruby30 1 :Macros %define _with_ruby27 1 +%define _with_ruby30 1 %define rb_default_ruby ruby27 %define rb_default_ruby_suffix ruby2.7 %define rb_default_ruby_abi ruby:2.7.0 -%define rb_build_ruby_abis ruby:2.7.0 -%define rb_build_versions ruby27 +%define rb_build_ruby_abis ruby:2.7.0 ruby:3.0.0 +%define rb_build_versions ruby27 ruby30 Prefer: -ruby-stdlib Prefer: %{rb_default_ruby_suffix}-rubygem-asciidoctor diff --git a/_staging_workflow b/_staging_workflow index 8eeca4b..c18b5d3 100644 --- a/_staging_workflow +++ b/_staging_workflow @@ -42,7 +42,6 @@ - @@ -61,12 +60,12 @@ - - - - + + + +