From 731dda66549488282e3cf2ce008db89f2eb0f809 Mon Sep 17 00:00:00 2001 From: reuben olinsky Date: Tue, 4 Aug 2026 21:57:03 +0000 Subject: [PATCH] fix(avahi): keep normal dist tag Override __bootstrap while retaining the bootstrap bcond so reduced-feature builds use the standard Azure Linux dist tag. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- base/comps/avahi/avahi.comp.toml | 3 +++ locks/avahi.lock | 2 +- specs/a/avahi/avahi.azl.macros | 1 + specs/a/avahi/avahi.spec | 2 +- 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/base/comps/avahi/avahi.comp.toml b/base/comps/avahi/avahi.comp.toml index 47ad802f428..3c1149a68d6 100644 --- a/base/comps/avahi/avahi.comp.toml +++ b/base/comps/avahi/avahi.comp.toml @@ -5,3 +5,6 @@ # from the distro entirely. [components.avahi] build.with = ["bootstrap"] +# Avahi uses this bcond only to select a reduced feature set; it is not a +# transitional bootstrap build and should retain the normal distro suffix. +build.defines = { __bootstrap = "%{nil}" } diff --git a/locks/avahi.lock b/locks/avahi.lock index 1128775f127..98c346584b4 100644 --- a/locks/avahi.lock +++ b/locks/avahi.lock @@ -2,5 +2,5 @@ version = 1 import-commit = 'b19244db41146b4456d09f0fb9872da5b04a59b6' upstream-commit = 'b19244db41146b4456d09f0fb9872da5b04a59b6' -input-fingerprint = 'sha256:2b3547e31986283ab855872bb7cda5b861852c4ab063a093300313085df5943d' +input-fingerprint = 'sha256:b96c1e5451b434ed0efd0c77d5b84ba7324ca5ea077b7dbb607494b816b3255d' resolution-input-hash = 'sha256:466421704711c4fd3c71f0b2ed715a0e61d49e3e26f3a2637fee755795849c8e' diff --git a/specs/a/avahi/avahi.azl.macros b/specs/a/avahi/avahi.azl.macros index deb64a40af1..24a88219b59 100644 --- a/specs/a/avahi/avahi.azl.macros +++ b/specs/a/avahi/avahi.azl.macros @@ -1,3 +1,4 @@ # Macros file automatically generated by azldev. # Do not edit manually; changes will be overwritten. +%__bootstrap %{nil} %_with_bootstrap 1 diff --git a/specs/a/avahi/avahi.spec b/specs/a/avahi/avahi.spec index a4504e5447c..2726a3c523a 100644 --- a/specs/a/avahi/avahi.spec +++ b/specs/a/avahi/avahi.spec @@ -66,7 +66,7 @@ Name: avahi Version: 0.9%{?rc:~%{rc}} -Release: 8%{?dist} +Release: 9%{?dist} Summary: Local network service discovery License: LGPL-2.1-or-later AND LGPL-2.0-or-later AND BSD-2-Clause-Views AND MIT URL: http://avahi.org