From 33a6637f9159c74f256ae5fddbf9308d5c6580d5 Mon Sep 17 00:00:00 2001 From: reuben olinsky Date: Wed, 11 Nov 2026 12:10:19 -0800 Subject: [PATCH] feat(publishing): promote rpmautospec and norpm to Base Include python-norpm to close rpmautospec's runtime dependencies in Base. Bump both components' rebuild counters so the promotion triggers new builds without changing upstream pins. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- base/comps/components-publish-channels.toml | 2 ++ locks/python-norpm.lock | 3 ++- locks/python-rpmautospec.lock | 4 ++-- specs/p/python-norpm/python-norpm.spec | 2 +- specs/p/python-rpmautospec/python-rpmautospec.spec | 5 ++++- 5 files changed, 11 insertions(+), 5 deletions(-) diff --git a/base/comps/components-publish-channels.toml b/base/comps/components-publish-channels.toml index fee6ec690a2..5b417a0289a 100644 --- a/base/comps/components-publish-channels.toml +++ b/base/comps/components-publish-channels.toml @@ -2045,6 +2045,7 @@ components = [ "python-netaddr", "python-netifaces", "python-networkx", + "python-norpm", "python-oauthlib", "python-openpyxl", "python-openshift", @@ -2126,6 +2127,7 @@ components = [ "python-rpds-py", "python-rpm-generators", "python-rpm-macros", + "python-rpmautospec", "python-rpmautospec-core", "python-rsa", "python-rtslib", diff --git a/locks/python-norpm.lock b/locks/python-norpm.lock index 8d0854228cf..83d53c784a7 100644 --- a/locks/python-norpm.lock +++ b/locks/python-norpm.lock @@ -2,5 +2,6 @@ version = 1 import-commit = 'c4084bfeecd69464da64d7d1bf64d2b9a40bfd04' upstream-commit = 'c4084bfeecd69464da64d7d1bf64d2b9a40bfd04' -input-fingerprint = 'sha256:ac21c055b51145241a99c25523e81e5eef7ad554df7b06b3a028e881d9481d27' +manual-bump = 1 +input-fingerprint = 'sha256:b5e4be50b46396d65880853521af454791970fe5284b5da5b51450e3508c1e6d' resolution-input-hash = 'sha256:ee2b4b2a7474232699f7ef1461160019159849dcc0daf2dcff1aabf35416ecec' diff --git a/locks/python-rpmautospec.lock b/locks/python-rpmautospec.lock index 9f8e69cd3ff..bd2feb0059c 100644 --- a/locks/python-rpmautospec.lock +++ b/locks/python-rpmautospec.lock @@ -2,6 +2,6 @@ version = 1 import-commit = 'df90f67fe7aae74edd3680d5af139d994aafaa23' upstream-commit = '2c28b8ae2207fa873a4c23d455cb7b9b9c5384ae' -manual-bump = 2 -input-fingerprint = 'sha256:4ed31bfdd986d52909503f3c2a109264eff50e6e7588b5e4d14411ac0a7a3f03' +manual-bump = 3 +input-fingerprint = 'sha256:e972bdbf2b9b5ac1fc29d11eac5af43fbb3de6be4000367d05834cafa2ad524d' resolution-input-hash = 'sha256:ee2b4b2a7474232699f7ef1461160019159849dcc0daf2dcff1aabf35416ecec' diff --git a/specs/p/python-norpm/python-norpm.spec b/specs/p/python-norpm/python-norpm.spec index 4aabe740801..b00b9461f11 100644 --- a/specs/p/python-norpm/python-norpm.spec +++ b/specs/p/python-norpm/python-norpm.spec @@ -3,7 +3,7 @@ Name: python-norpm Version: 1.11 -Release: 2%{?dist} +Release: 3%{?dist} Summary: RPM Macro Expansion in Python License: LGPL-2.1-or-later diff --git a/specs/p/python-rpmautospec/python-rpmautospec.spec b/specs/p/python-rpmautospec/python-rpmautospec.spec index abec13ea2ee..ecdc06e1299 100644 --- a/specs/p/python-rpmautospec/python-rpmautospec.spec +++ b/specs/p/python-rpmautospec/python-rpmautospec.spec @@ -2,7 +2,7 @@ ## (rpmautospec version 0.8.3) ## 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}} @@ -302,6 +302,9 @@ PYTHONPATH="$PWD/poison-pill:$PYTHONPATH" \ %changelog ## START: Generated by rpmautospec +* Wed Nov 11 2026 reuben olinsky - 0.8.4-3 +- feat(publishing): promote rpmautospec and norpm to Base + * Mon Oct 05 2026 Dan Streetman - 0.8.4-2 - chore: update 'lock' files and render changed components