From 52c4e5f8eb18e6c44572a78695af804b5e3ed40d Mon Sep 17 00:00:00 2001 From: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> Date: Mon, 2 Mar 2026 02:29:16 -0600 Subject: [PATCH] 42: backport: feat: add terra@fyralabs.com to fyra/terra packages (#10186) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * backport: feat: add terra@fyralabs.com to fyra/terra packages Signed-off-by: Owen-sz * this Signed-off-by: Owen-sz * bump(terra-appstream-helper): release 2 → 3 * bump(anda-srpm-macros): release 3 → 4 * bump(terra-mock-configs): release 2 → 3 * ueghreirgsuhxitudfhbxirutdhbsxtidufnhxutib Signed-off-by: Owen-sz --------- Signed-off-by: Owen-sz Co-authored-by: hamachitan[bot] <252235638+hamachitan[bot]@users.noreply.github.com> --- anda/terra/appstream-helper/terra-appstream-helper.spec | 4 +++- anda/terra/gpg-keys/RELEASE.txt | 2 +- anda/terra/gpg-keys/terra-gpg-keys.spec | 4 +++- anda/terra/mock-configs/terra-mock-configs.spec | 4 +++- anda/terra/obsolete/RELEASE.txt | 2 +- anda/terra/obsolete/terra-obsolete.spec | 4 +++- anda/terra/release/RELEASE.txt | 2 +- anda/terra/release/terra-release.spec | 4 +++- anda/terra/srpm-macros/anda-srpm-macros.spec | 4 +++- 9 files changed, 21 insertions(+), 9 deletions(-) diff --git a/anda/terra/appstream-helper/terra-appstream-helper.spec b/anda/terra/appstream-helper/terra-appstream-helper.spec index fd45dfab41..248cda2d73 100644 --- a/anda/terra/appstream-helper/terra-appstream-helper.spec +++ b/anda/terra/appstream-helper/terra-appstream-helper.spec @@ -1,6 +1,6 @@ Name: terra-appstream-helper Version: 0.1.10 -Release: 1%?dist +Release: 2%?dist Summary: Scripts and RPM macros to help with AppStream metadata generation for Terra License: GPL-3.0-or-Later URL: https://github.com/terrapkg/appstream-helper @@ -9,6 +9,8 @@ BuildArch: noarch Requires: python3-%{name} = %{evr} BuildRequires: anda-srpm-macros python3-devel python3-installer pyproject-rpm-macros python3dist(pip) python3dist(setuptools) python3dist(wheel) +Packager: Terra Packaging Team + %description %{summary}. diff --git a/anda/terra/gpg-keys/RELEASE.txt b/anda/terra/gpg-keys/RELEASE.txt index 3358c928e7..d0eca39e42 100644 --- a/anda/terra/gpg-keys/RELEASE.txt +++ b/anda/terra/gpg-keys/RELEASE.txt @@ -1 +1 @@ -F42 \ No newline at end of file +F42 diff --git a/anda/terra/gpg-keys/terra-gpg-keys.spec b/anda/terra/gpg-keys/terra-gpg-keys.spec index 97ae59ba93..fc80a23efc 100644 --- a/anda/terra/gpg-keys/terra-gpg-keys.spec +++ b/anda/terra/gpg-keys/terra-gpg-keys.spec @@ -2,7 +2,7 @@ Name: terra-gpg-keys Version: %{?fedora:%{fedora}}%{?rhel:%{rhel}} -Release: 3%?dist +Release: 4%?dist Summary: GPG keys for Terra Requires: filesystem >= 3.18-6 @@ -53,6 +53,8 @@ Source40: RPM-GPG-KEY-terrael10 Source41: RPM-GPG-KEY-terrael10-source BuildArch: noarch +Packager: Terra Packaging Team + %description GPG keys for Terra, used for verifying RPM package signatures. diff --git a/anda/terra/mock-configs/terra-mock-configs.spec b/anda/terra/mock-configs/terra-mock-configs.spec index e4da75ea34..da7e6477b3 100644 --- a/anda/terra/mock-configs/terra-mock-configs.spec +++ b/anda/terra/mock-configs/terra-mock-configs.spec @@ -1,6 +1,6 @@ Name: terra-mock-configs Version: 2.2.4 -Release: 1%?dist +Release: 3%?dist Epoch: 1 Summary: Mock configs for Terra repos @@ -15,6 +15,8 @@ BuildArch: noarch Provides: anda-mock-configs = %{epoch}:%{version}-%{release} Obsoletes: anda-mock-configs < 3-2%{?dist} +Packager: Terra Packaging Team + %description %{summary} diff --git a/anda/terra/obsolete/RELEASE.txt b/anda/terra/obsolete/RELEASE.txt index 3358c928e7..d0eca39e42 100644 --- a/anda/terra/obsolete/RELEASE.txt +++ b/anda/terra/obsolete/RELEASE.txt @@ -1 +1 @@ -F42 \ No newline at end of file +F42 diff --git a/anda/terra/obsolete/terra-obsolete.spec b/anda/terra/obsolete/terra-obsolete.spec index 56119ce212..c7ad659493 100644 --- a/anda/terra/obsolete/terra-obsolete.spec +++ b/anda/terra/obsolete/terra-obsolete.spec @@ -4,12 +4,14 @@ Version: %{?fedora:%{fedora}}%{?rhel:%{rhel}} # The dist number is the version here, it is intentionally not repeated in the release %global dist %nil -Release: 5 +Release: 6 Summary: A package to obsolete retired packages, based on Fedora's equivalent package License: LicenseRef-Fedora-Public-Domain BuildArch: noarch +Packager: Terra Packaging Team + # =============================================================================== # Skip down below these convenience macros %define obsolete_ticket() %{lua: diff --git a/anda/terra/release/RELEASE.txt b/anda/terra/release/RELEASE.txt index 3358c928e7..d0eca39e42 100644 --- a/anda/terra/release/RELEASE.txt +++ b/anda/terra/release/RELEASE.txt @@ -1 +1 @@ -F42 \ No newline at end of file +F42 diff --git a/anda/terra/release/terra-release.spec b/anda/terra/release/terra-release.spec index 55d85405e9..777db59dea 100644 --- a/anda/terra/release/terra-release.spec +++ b/anda/terra/release/terra-release.spec @@ -2,7 +2,7 @@ Name: terra-release Version: %{?fedora:%{fedora}}%{?rhel:%{rhel}} -Release: 7 +Release: 8 Summary: Release package for Terra License: MIT @@ -18,6 +18,8 @@ Requires: system-release(%{version}) Requires: terra-gpg-keys +Packager: Terra Packaging Team + %description Release package for Terra, containing the Terra repository configuration. diff --git a/anda/terra/srpm-macros/anda-srpm-macros.spec b/anda/terra/srpm-macros/anda-srpm-macros.spec index 9b4ce4eeae..010feeb3cc 100644 --- a/anda/terra/srpm-macros/anda-srpm-macros.spec +++ b/anda/terra/srpm-macros/anda-srpm-macros.spec @@ -1,6 +1,6 @@ Name: anda-srpm-macros Version: 0.3.3 -Release: 2%?dist +Release: 3%?dist Summary: SRPM macros for extra Fedora packages License: MIT @@ -13,6 +13,8 @@ Obsoletes: fyra-srpm-macros < 0.1.1-1 Provides: fyra-srpm-macros = %{version}-%{release} BuildArch: noarch +Packager: Terra Packaging Team + %description %{summary}