43: backport: feat: add terra@fyralabs.com to fyra/terra packages (#10185)

* backport: feat: add terra@fyralabs.com to fyra/terra packages

Signed-off-by: Owen-sz <owen@fyralabs.com>

* sync this

Signed-off-by: Owen-sz <owen@fyralabs.com>

* bump(terra-mock-configs): release 2 → 3

* bump(terra-appstream-helper): release 2 → 3

* bump(anda-srpm-macros): release 3 → 4

* smh

Signed-off-by: Owen-sz <owen@fyralabs.com>

* proper bump

Signed-off-by: Owen-sz <owen@fyralabs.com>

---------

Signed-off-by: Owen-sz <owen@fyralabs.com>
Co-authored-by: hamachitan[bot] <252235638+hamachitan[bot]@users.noreply.github.com>
This commit is contained in:
Owen Zimmerman
2026-03-02 02:29:46 -06:00
committed by GitHub
parent ab8a938558
commit c52fbfe1a6
9 changed files with 21 additions and 9 deletions
@@ -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 <terra@fyralabs.com>
%description
%{summary}.
+1 -1
View File
@@ -1 +1 @@
F43
F43
+3 -1
View File
@@ -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 <terra@fyralabs.com>
%description
GPG keys for Terra, used for verifying RPM package signatures.
@@ -1,6 +1,6 @@
Name: terra-mock-configs
Version: 2.2.4
Release: 1%?dist
Release: 2%?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 <terra@fyralabs.com>
%description
%{summary}
+1 -1
View File
@@ -1 +1 @@
F43
F43
+3 -1
View File
@@ -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 <terra@fyralabs.com>
# ===============================================================================
# Skip down below these convenience macros
%define obsolete_ticket() %{lua:
+1 -1
View File
@@ -1 +1 @@
F43
F43
+3 -1
View File
@@ -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 <terra@fyralabs.com>
%description
Release package for Terra, containing the Terra repository configuration.
+3 -1
View File
@@ -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 <terra@fyralabs.com>
%description
%{summary}