fix: Set manual release calculation for components with macro-based Release tags#16920
Merged
reubeno merged 36 commits intomicrosoft:tomls/base/mainfrom Apr 29, 2026
Merged
Conversation
❌ Rendered specs are out of date🚧🚧🚧🚧🚧 Warning Disregard this comment. Spec rendering is still under development and checked-in specs 🚧🚧🚧🚧🚧 FIX: — run this and commit the result: azldev component render -a --clean-staleOr download the fix patch and apply it: gh run download 25082970951 -R microsoft/azurelinux -n rendered-specs-patch
git apply rendered-specs.patch
Content diffs`specs/a/anaconda-webui/anaconda-webui.spec`--- committed/specs/a/anaconda-webui/anaconda-webui.spec
+++ rendered/specs/a/anaconda-webui/anaconda-webui.spec
@@ -46,7 +46,6 @@
Requires: (firefox if fedora-release-workstation)
%endif
%if 0%{?fedora}
-Requires: fedora-logos
%endif
BuildRequires: desktop-file-utils
@@ -77,6 +76,7 @@
Provides: bundled(npm(throttle-debounce)) = 5.0.2
Provides: bundled(npm(tslib)) = 2.8.1
+Requires: system-logos
%description
Anaconda installer Web interface
`specs/a/azurelinux-release/90-default-user.preset`--- committed/specs/a/azurelinux-release/90-default-user.preset
+++ rendered/specs/a/azurelinux-release/90-default-user.preset
@@ -2,6 +2,3 @@
# unconditionally. It is used throughout the distro and required on all machines.
enable dbus.socket
enable dbus-broker.service
-
-# TODO(azl): evaluate these
-# enable grub-boot-success.timer
`specs/a/azurelinux-release/90-default.preset`--- committed/specs/a/azurelinux-release/90-default.preset
+++ rendered/specs/a/azurelinux-release/90-default.preset
@@ -1,4 +1,3 @@
-# TODO(azl): review this file
# We deviate from some upstream defaults
disable systemd-timesyncd.service
@@ -7,6 +6,7 @@
enable systemd-resolved.service
+enable systemd-oomd.socket
enable systemd-oomd.service
# System stuff
@@ -364,8 +364,8 @@
enable kernel-bootcfg-boot-successful.service
# Enable lvm-devices-import
-enable /usr/lib/systemd/system/lvm-devices-import.path
-enable /usr/lib/systemd/system/lvm-devices-import.service
+enable lvm-devices-import.path
+enable lvm-devices-import.service
# Enable fips-crypto-policy-overlay
enable fips-crypto-policy-overlay.service
`specs/g/GitPython/GitPython.spec`--- committed/specs/g/GitPython/GitPython.spec
+++ rendered/specs/g/GitPython/GitPython.spec
@@ -5,7 +5,7 @@
Name: %{srcname}
Version: 3.1.46
-Release: 2%{?dist}
+Release: 4%{?dist}
Summary: Python Git Library
License: BSD-3-Clause
@@ -62,6 +62,12 @@
%doc CHANGES AUTHORS
%changelog
+* Fri Jan 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.46-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
+
+* Fri Jan 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.46-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
+
* Sat Jan 03 2026 Benjamin A. Beasley <code@musicinmybrain.net> - 3.1.46-1
- Update to 3.1.46 (close RHBZ#2426665)
`specs/i/intel-ipsec-mb/intel-ipsec-mb.spec`--- committed/specs/i/intel-ipsec-mb/intel-ipsec-mb.spec
+++ rendered/specs/i/intel-ipsec-mb/intel-ipsec-mb.spec
@@ -13,7 +13,7 @@
Name: intel-ipsec-mb
Version: 2.0.1
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: IPsec cryptography library optimized for Intel Architecture
License: BSD-3-Clause
@@ -67,6 +67,9 @@
%{_mandir}/man7/libipsec-mb-dev.*
%changelog
+* Fri Jan 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
+
* Thu Jul 24 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
`specs/k/kdump-utils/kdump-utils.spec`--- committed/specs/k/kdump-utils/kdump-utils.spec
+++ rendered/specs/k/kdump-utils/kdump-utils.spec
@@ -44,6 +44,7 @@
%ifnarch s390x
Requires: systemd-udev%{?_isa}
%endif
+Patch0: kdumpctl-Use-only-first-match-in-_find_kernel_path_b.patch
%description
kdump-utils is responsible for collecting the crash kernel dump. It builds and
loads the kdump initramfs so when a kernel crashes, the system will boot the
@@ -134,7 +135,7 @@
%changelog
## START: Generated by rpmautospec
-* Wed Apr 22 2026 azldev <azurelinux@microsoft.com> - 1.0.59-2
+* Tue Apr 28 2026 azldev <azurelinux@microsoft.com> - 1.0.59-2
- Latest state for kdump-utils
* Wed Nov 19 2025 Packit <hello@packit.dev> - 1.0.59-1
`specs/k/kf6-breeze-icons/kf6-breeze-icons.spec`--- committed/specs/k/kf6-breeze-icons/kf6-breeze-icons.spec
+++ rendered/specs/k/kf6-breeze-icons/kf6-breeze-icons.spec
@@ -66,7 +66,7 @@
%description -n breeze-icon-theme
%{summary}.
-%if 0%{?fedora}
+%if 0
%package -n breeze-icon-theme-fedora
Summary: Breeze icon theme Fedora specific icons
License: LGPL-3.0-or-later
@@ -136,7 +136,7 @@
# %%ghost icon.cache
touch %{buildroot}%{_kf6_datadir}/icons/{breeze,breeze-dark}/icon-theme.cache
-%if 0%{?fedora}
+%if 0
install -pm 0644 icons-fedora/apps/48/org.fedoraproject.AnacondaInstaller.svg %{buildroot}%{_kf6_datadir}/icons/breeze/apps/48
ln -sr %{buildroot}%{_kf6_datadir}/icons/breeze/apps/48/org.fedoraproject.AnacondaInstaller.svg %{buildroot}%{_kf6_datadir}/icons/breeze-dark/apps/48/org.fedoraproject.AnacondaInstaller.svg
%endif
@@ -178,11 +178,11 @@
%{_datadir}/icons/breeze-dark/index.theme
%{_datadir}/icons/breeze-dark/*/
%exclude %{_datadir}/icons/breeze/breeze-icons.rcc
-%if 0%{?fedora}
+%if 0
%exclude %{_datadir}/icons/breeze*/apps/*/org.fedoraproject.AnacondaInstaller.svg
%endif
-%if 0%{?fedora}
+%if 0
%files -n breeze-icon-theme-fedora
%{_datadir}/icons/breeze*/apps/*/org.fedoraproject.AnacondaInstaller.svg
%endif
`specs/p/perl-CryptX/perl-CryptX.spec`--- committed/specs/p/perl-CryptX/perl-CryptX.spec
+++ rendered/specs/p/perl-CryptX/perl-CryptX.spec
@@ -8,7 +8,7 @@
Name: perl-CryptX
Version: 0.087
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: Cryptographic toolkit
# src/ltc/*: Unlicense
# src/ltm/*: Unlicense
@@ -153,6 +153,9 @@
%{_libexecdir}/%{name}
%changelog
+* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 0.087-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
+
* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.087-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
`specs/p/python-fastavro/python-fastavro.spec`--- committed/specs/p/python-fastavro/python-fastavro.spec
+++ rendered/specs/p/python-fastavro/python-fastavro.spec
@@ -2,7 +2,7 @@
## (rpmautospec version 0.8.4)
## RPMAUTOSPEC: autorelease, autochangelog
%define autorelease(e:s:pb:n) %{?-p:0.}%{lua:
- release_number = 2;
+ release_number = 3;
base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}"));
print(release_number + base_release_number - 1);
}%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}}
@@ -184,8 +184,11 @@
%changelog
## START: Generated by rpmautospec
-* Wed Apr 22 2026 azldev <azurelinux@microsoft.com> - 1.12.1-2
+* Tue Apr 28 2026 azldev <azurelinux@microsoft.com> - 1.12.1-3
- Latest state for python-fastavro
+
+* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.12.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
* Fri Oct 10 2025 Packit <hello@packit.dev> - 1.12.1-1
- Update to 1.12.1 upstream release
`specs/p/python-matplotlib/python-matplotlib.spec`--- committed/specs/p/python-matplotlib/python-matplotlib.spec
+++ rendered/specs/p/python-matplotlib/python-matplotlib.spec
@@ -2,7 +2,7 @@
## (rpmautospec version 0.8.4)
## RPMAUTOSPEC: autorelease, autochangelog
%define autorelease(e:s:pb:n) %{?-p:0.}%{lua:
- release_number = 2;
+ release_number = 3;
base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}"));
print(release_number + base_release_number - 1);
}%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}}
@@ -493,8 +493,11 @@
%changelog
## START: Generated by rpmautospec
-* Wed Apr 22 2026 azldev <azurelinux@microsoft.com> - 3.10.8-2
+* Tue Apr 28 2026 azldev <azurelinux@microsoft.com> - 3.10.8-3
- Latest state for python-matplotlib
+
+* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 3.10.8-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
* Wed Jan 07 2026 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 3.10.8-1
- Update to latest version (#2402615)
… and 11 more file(s). Run the remediation command above to see all changes. Files to addThese files are produced by
… and 216 more file(s). Files to removeThese files are in your branch but are not produced by render. Remove them.
… and 151 more file(s). |
rlmenge
requested review from
christopherco,
ddstreetmicrosoft and
reubeno
as code owners
…elease tag
The upstream kernel-headers spec uses %{specrelease} macro in the Release
tag, which azldev's auto-bump logic cannot parse. Setting manual release
calculation allows the render to succeed.
Fixes RENDER_FAILED by skipping the auto-bump check for macro-based Release.
The upstream kernel spec uses %{pkg_release} macro in the Release tag,
which azldev's auto-bump logic cannot parse. Setting manual release
calculation allows the render to succeed.
Fixes RENDER_FAILED by skipping the auto-bump check for macro-based Release.
The upstream spec uses %{baserelease}%{?dist} for the Release tag,
which requires manual release calculation to render correctly.
The upstream spec uses %{baserelease}%{?dist} for the Release tag,
which requires manual release calculation to render correctly.
The upstream spec uses %{patch_level}.git%{?shortcommit0}%{?dist} for the Release tag,
which requires manual release calculation to render correctly.
…e tag
The upstream spec uses %{cross_gcc_release}%{?dist} for the Release tag,
which requires manual release calculation to render correctly.
…se tag
The upstream spec uses %{release_number}%{?phase:.}%{?phase}%{?timestamp:.}%{?timestamp}%{?commit_id:.}%{?commit_id}%{?dist} for the Release tag,
which requires manual release calculation to render correctly.
… tag
The upstream spec uses %{baserelease}%{?dist} for the Release tag,
which requires manual release calculation to render correctly.
The upstream spec uses %{gcc_release}%{?dist} for the Release tag,
which requires manual release calculation to render correctly.
The upstream spec uses %{baserelease}%{?dist} for the Release tag,
which requires manual release calculation to render correctly.
…Release tag
The upstream spec uses %{?eaprefix}%{rpmrelease}%{?extraver}%{?dist} for the Release tag,
which requires manual release calculation to render correctly.
…ro-based Release tag
The upstream spec uses %{?eaprefix}%{rpmrelease}%{?extraver}%{?dist} for the Release tag,
which requires manual release calculation to render correctly.
The upstream spec uses %{release_number}%{?phase:.}%{?phase}%{?timestamp:.}%{?timestamp}%{?commit_id:.}%{?commit_id}%{?dist} for the Release tag,
which requires manual release calculation to render correctly.
The upstream spec uses a macro-based Release tag (%{krb5_release})
which cannot be auto-incremented. Configure manual release calculation
to bypass the auto-bump mechanism.
The upstream spec uses a macro-based Release tag
(%{release_number}%{?phase:.}%{?phase}%{?timestamp:.}%{?timestamp}%{?commit_id:.}%{?commit_id}%{?dist})
which cannot be auto-incremented. Configure manual release calculation
to bypass the auto-bump mechanism.
…d Release tag
The upstream spec uses a macro-based Release tag (%{serial}%{?dist}.1)
which cannot be auto-incremented. Configure manual release calculation
to bypass the auto-bump mechanism.
… tag
The upstream spec uses a macro-based Release tag (%{nodejs_release})
which cannot be auto-incremented. Configure manual release calculation
to bypass the auto-bump mechanism.
… tag
The upstream spec uses a macro-based Release tag (%{node_release})
which cannot be auto-incremented. Configure manual release calculation
to bypass the auto-bump mechanism.
The upstream spec uses a macro-based Release tag (%{nss_release}%{?dist})
which cannot be auto-incremented. Configure manual release calculation
to bypass the auto-bump mechanism.
…e tag
The upstream spec uses a macro-based Release tag
(%{?prerelease:0.}%{baserelease}%{?dist})
which cannot be auto-incremented. Configure manual release calculation
to bypass the auto-bump mechanism.
…ase tag
The upstream spec uses a macro-based Release tag (%{release}%{?dist})
which cannot be auto-incremented. Configure manual release calculation
to bypass the auto-bump mechanism.
…e tag
The upstream spec uses a macro-based Release tag (%{pcmk_release}%{?dist})
which cannot be auto-incremented. Configure manual release calculation
to bypass the auto-bump mechanism.
The upstream spec uses a macro-based Release tag
(%{?rcversion:0.}1%{?rcversion:.%rcversion}%{?dist}.9)
which cannot be auto-incremented. Configure manual release calculation
to bypass the auto-bump mechanism.
The upstream spec uses a macro-based Release tag
(%{?rcversion:0.}1%{?rcversion:.%rcversion}%{?dist})
which cannot be auto-incremented. Configure manual release calculation
to bypass the auto-bump mechanism.
… tag
The upstream spec uses a macro-based Release tag
(%{baserelease}%{?snapdate:.%{snapdate}git%{shortcommit}}%{?dist})
which cannot be auto-incremented. Configure manual release calculation
to bypass the auto-bump mechanism.
The upstream spec uses a macro-based Release tag
(%{?snapver:0.%{snapver}.}%{baserelease}%{?dist})
which cannot be auto-incremented. Configure manual release calculation
to bypass the auto-bump mechanism.
… Release tag
The upstream spec uses a macro-based Release tag
(%{?prever:0.}%{baserelease}%{?prever:.%{prerpmver}}%{?dist})
which cannot be auto-incremented. Configure manual release calculation
to bypass the auto-bump mechanism.
…ease tag
The upstream spec uses a macro-based Release tag
(%{?preminorver:0.}%{baserelease}%{?preminorver:%{rpmminorver}}%{?dist})
which cannot be auto-incremented. Configure manual release calculation
to bypass the auto-bump mechanism.
…ed Release tag
The upstream spec uses a macro-based Release tag
(%{?preminorver:0.}%{baserelease}%{?preminorver:%{rpmminorver}}%{?dist})
which cannot be auto-incremented. Configure manual release calculation
to bypass the auto-bump mechanism.
…acro-based Release tag
The upstream spec uses a macro-based Release tag
(%{?preminorver:0.}%{baserelease}%{?preminorver:%{rpmminorver}}%{?dist})
which cannot be auto-incremented. Configure manual release calculation
to bypass the auto-bump mechanism.
…sed Release tag
The upstream spec uses a macro-based Release tag
(%{?preminorver:0.}%{baserelease}%{?preminorver:%{rpmminorver}}%{?dist})
which cannot be auto-incremented. Configure manual release calculation
to bypass the auto-bump mechanism.
…based Release tag
The upstream spec uses a macro-based Release tag
(%{?prever:0.}%{baserelease}%{?prever:.%{prerpmver}}%{?dist})
which cannot be auto-incremented. Configure manual release calculation
to bypass the auto-bump mechanism.
The upstream spec uses a macro-based Release tag
(%{samba_release})
which cannot be auto-incremented. Configure manual release calculation
to bypass the auto-bump mechanism.
The upstream spec uses a macro-based Release tag
(%{baserelease}%{?dist})
which cannot be auto-incremented. Configure manual release calculation
to bypass the auto-bump mechanism.
The upstream spec uses a macro-based Release tag
(%{?prever:0.}13%{?prever:.%{prever}}%{?dist}.1)
which cannot be auto-incremented. Configure manual release calculation
to bypass the auto-bump mechanism.
…ase tag
The upstream spec uses a macro-based Release tag
(%{date}.%{baserelease}%{?dist})
which cannot be auto-incremented. Configure manual release calculation
to bypass the auto-bump mechanism.
rlmenge
force-pushed
the
rlmenge/update-rendered-specs
branch
from
827db5e to
a5da92c
Compare
reubeno
approved these changes
Apr 29, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Merge Checklist
All boxes should be checked before merging the PR (just tick any boxes which don't apply to this PR)
*-staticsubpackages, etc.) have had theirReleasetag incremented../cgmanifest.json,./toolkit/scripts/toolchain/cgmanifest.json,.github/workflows/cgmanifest.json)./LICENSES-AND-NOTICES/SPECS/data/licenses.json,./LICENSES-AND-NOTICES/SPECS/LICENSES-MAP.md,./LICENSES-AND-NOTICES/SPECS/LICENSE-EXCEPTIONS.PHOTON)*.signatures.jsonfilessudo make go-tidy-allandsudo make go-test-coveragepassSummary
This PR configures release = { calculation = "manual" } for 36 components whose upstream specs use macro-based Release tags that cannot be auto-incremented by azldev's release bump mechanism.
Components with Release tags like %{baserelease}%{?dist}, %{samba_release}, or %{?prever:0.}%{baserelease}%{?prever:.%{prerpmver}}%{?dist} fail to render because azldev cannot parse and increment these macro expressions.
For each affected component, added release = { calculation = "manual" } to the component definition, which bypasses the auto-bump mechanism and preserves the upstream Release tag as-is.
Change Log
Does this affect the toolchain?
NO
Associated issues
Test Methodology