From 5a0611a713737c39514b157104a2be21d92f5af5 Mon Sep 17 00:00:00 2001 From: Bernhard M. Wiedemann <bwiedemann@suse.de> Date: Mar 12 2024 08:45:25 +0000 Subject: update --- diff --git a/_attribute b/_attribute index 21d123c..ac1661c 100644 --- a/_attribute +++ b/_attribute @@ -5,27 +5,27 @@ <attribute namespace="OSRT" name="IgnoredIssues"> <value>last_seen: boo#1172073: '20240205' - boo#1207390: '20240308' - boo#1207940: '20240308' + boo#1207390: '20240310' + boo#1207940: '20240310' boo#1209053: '20240129' boo#1209728: '20240115' - boo#1216660: '20240308' - boo#1217029: '20240308' - boo#1217683: '20240308' - boo#1218131: '20240307' + boo#1216660: '20240310' + boo#1217029: '20240310' + boo#1217683: '20240309' + boo#1218131: '20240310' boo#1218492: '20240124' boo#1218565: '20240107' boo#1218847: '20240126' boo#1218954: '20240119' - boo#1219132: '20240308' + boo#1219132: '20240310' boo#1219135: '20240124' boo#1219139: '20240129' boo#1219188: '20240128' boo#1219242: '20240205' boo#1219284: '20240222' - boo#1219384: '20240308' + boo#1219384: '20240310' boo#1219401: '20240216' - boo#1219481: '20240308' + boo#1219481: '20240310' boo#1219529: '20240204' boo#1219530: '20240205' boo#1219531: '20240205' @@ -35,8 +35,8 @@ boo#1219602: '20240205' boo#1219904: '20240213' boo#1220000: '20240301' - boo#1221110: '20240308' - boo#1221206: '20240308' + boo#1221110: '20240310' + boo#1221206: '20240310' gh#os-autoinst/os-autoinst-distri-opensuse#18471: '20240116' gh#os-autoinst/os-autoinst-distri-opensuse#18688: '20240218' poo#105271: '20240306' @@ -44,8 +44,8 @@ poo#132191: '20240116' poo#133691: '20240111' poo#134078: '20240128' - poo#137423: '20240307' - poo#138743: '20240308' + poo#137423: '20240310' + poo#138743: '20240309' poo#152320: '20240226' poo#152551: '20240116' poo#152793: '20240109' @@ -55,7 +55,7 @@ poo#153526: '20240116' poo#153895: '20240118' poo#154153: '20240128' - poo#154465: '20240308' + poo#154465: '20240310' poo#154471: '20240130' poo#154693: '20240211' poo#154714: '20240214' @@ -65,8 +65,9 @@ poo#155980: '20240223' poo#156037: '20240228' poo#156127: '20240226' - poo#156223: '20240308' - poo#156955: '20240308' + poo#156223: '20240310' + poo#156295: '20240310' + poo#156955: '20240310' </value> </attribute> <attribute namespace="OSRT" name="Config"> @@ -117,7 +118,7 @@ rebuildpacs-leafs = branding-openSUSE PackageKit-branding-openSUSE xfce4-brandin <value>s/openSUSE-/openSUSE-Staging:$LETTER-/</value> </attribute> <attribute namespace="OSRT" name="ProductVersion"> - <value>20240309</value> + <value>20240311</value> </attribute> <attribute namespace="OSRT" name="ToTestManagerConfig"> <value>arch: x86_64 @@ -525,9 +526,9 @@ set_snapshot_number: True</value> </attribute> <attribute namespace="OSRT" name="ToTestManagerStatus"> <value>failed: '' -published: '20240308' -publishing: '20240308' -testing: '20240308' +published: '20240310' +publishing: '20240310' +testing: '20240310' </value> </attribute> <attribute namespace="OSRT" name="OriginConfig"> diff --git a/_config b/_config index b835a42..025d312 100644 --- a/_config +++ b/_config @@ -594,6 +594,28 @@ Prefer: -python39-FontTools -python310-FontTools -python311-FontTools Prefer: -python311-pyside6 Prefer: -python312-pyside6 +# All this is for KF6 + plasma 6 +# have choice for (plasma-framework-desktoptheme or plasma6-framework-desktoptheme) needed by plasma-framework: libplasma6-desktoptheme plasma-framework-desktoptheme +Prefer: -plasma-framework-desktoptheme + +# have choice for sasl2-kdexoauth2 needed by libKPim6IMAP6: libkgapi6-sasl2-kdexoauth2 sasl2-kdexoauth2 +Prefer: -sasl2-kdexoauth2 + +# have choice for cmake(Breeze) >= MACRO: breeze5-style breeze6-devel +Prefer: -breeze5-style + +# have choice for cmake(KQuickImageEditor): kquickimageeditor-devel kquickimageeditor6-devel +Prefer: -kquickimageeditor-devel + +# have choice for ksysguardsystemstats-data >= 5.27.10 needed by libKSysGuardSystemStats1: ksysguardsystemstats-data ksysguardsystemstats6-data +Prefer: -ksysguardsystemstats-data + +# have choice for cmake(KDecoration2) >= MACRO: kdecoration6-devel libkdecoration2-devel +Prefer: -libkdecoration2-devel + + +#--- + 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 @@ -1068,6 +1090,12 @@ Prefer: -libomp13-devel -libomp14-devel # have choice for pkgconfig(libindi): indi-devel libindi-devel Prefer: -indi-devel +# have choice for purpose-services >= 5.115.0 needed by purpose: kf6-purpose-services purpose-services +Prefer: -purpose-services + +# have choice for cmake(KPipeWire): kpipewire-devel kpipewire6-devel +Prefer: -kpipewire-devel + # have choice for mbedtls-devel needed by bctoolbox-devel: mbedtls-2-devel mbedtls-devel Prefer: -mbedtls-2-devel @@ -3546,6 +3574,18 @@ RepoURL: https://download.opensuse.org/ports/zsystems/tumbleweed/repo/oss %endif RegistryURL: https://registry.opensuse.org +# Reproducible builds +%if "%{sub %_project 1 9}" == "openSUSE:" +Macros: +%source_date_epoch_from_changelog Y +:Macros +%endif +Macros: +%set_mtime_to_source_date_epoch Y +%use_source_date_epoch_as_buildtime Y +%_buildhost reproducible +:Macros + Macros: %suse_version 1699 %is_opensuse 1 @@ -3566,10 +3606,6 @@ Macros: %opensuse_bs 1 %_vendor suse -# Reproducible builds -%source_date_epoch_from_changelog Y -# clamp_mtime_to_source_date_epoch Y - # define which postgres is default %postgresql_default_ver 16 diff --git a/_staging_workflow b/_staging_workflow index d8cd91a..fd7174a 100644 --- a/_staging_workflow +++ b/_staging_workflow @@ -19,20 +19,32 @@ <staging_project name="openSUSE:Factory:Staging:adi:70"/> <staging_project name="openSUSE:Factory:Staging:adi:149"/> <staging_project name="openSUSE:Factory:Staging:adi:158"/> - <staging_project name="openSUSE:Factory:Staging:adi:90"/> - <staging_project name="openSUSE:Factory:Staging:adi:4"/> <staging_project name="openSUSE:Factory:Staging:adi:98"/> <staging_project name="openSUSE:Factory:Staging:adi:71"/> <staging_project name="openSUSE:Factory:Staging:adi:76"/> - <staging_project name="openSUSE:Factory:Staging:adi:40"/> <staging_project name="openSUSE:Factory:Staging:adi:9"/> - <staging_project name="openSUSE:Factory:Staging:adi:55"/> + <staging_project name="openSUSE:Factory:Staging:adi:1"/> + <staging_project name="openSUSE:Factory:Staging:adi:38"/> + <staging_project name="openSUSE:Factory:Staging:adi:41"/> + <staging_project name="openSUSE:Factory:Staging:adi:43"/> + <staging_project name="openSUSE:Factory:Staging:adi:45"/> + <staging_project name="openSUSE:Factory:Staging:adi:2"/> + <staging_project name="openSUSE:Factory:Staging:adi:3"/> + <staging_project name="openSUSE:Factory:Staging:adi:4"/> <staging_project name="openSUSE:Factory:Staging:adi:5"/> + <staging_project name="openSUSE:Factory:Staging:adi:6"/> + <staging_project name="openSUSE:Factory:Staging:adi:7"/> + <staging_project name="openSUSE:Factory:Staging:adi:8"/> + <staging_project name="openSUSE:Factory:Staging:adi:10"/> + <staging_project name="openSUSE:Factory:Staging:adi:11"/> + <staging_project name="openSUSE:Factory:Staging:adi:12"/> + <staging_project name="openSUSE:Factory:Staging:adi:13"/> <staging_project name="openSUSE:Factory:Staging:adi:14"/> + <staging_project name="openSUSE:Factory:Staging:adi:15"/> + <staging_project name="openSUSE:Factory:Staging:adi:16"/> + <staging_project name="openSUSE:Factory:Staging:adi:17"/> + <staging_project name="openSUSE:Factory:Staging:adi:18"/> <staging_project name="openSUSE:Factory:Staging:adi:19"/> <staging_project name="openSUSE:Factory:Staging:adi:20"/> <staging_project name="openSUSE:Factory:Staging:adi:21"/> - <staging_project name="openSUSE:Factory:Staging:adi:1"/> - <staging_project name="openSUSE:Factory:Staging:adi:2"/> - <staging_project name="openSUSE:Factory:Staging:adi:3"/> </workflow>