From f3b8635a04a427ea7db016eb36b37803039c331c Mon Sep 17 00:00:00 2001 From: Raboneko <119771935+raboneko@users.noreply.github.com> Date: Mon, 17 Nov 2025 22:10:19 -0800 Subject: [PATCH] chore: split multimedia into subpackage (#7441) (#7452) * chore: split multimedia into subpackage * more subrepo subpackages * make subrepo .repo files enable the subrepo * oops! * more oops * bump releasever --------- (cherry picked from commit 5d7a4945520c6f91f1d72ec9ad3e3682e03c6d2f) Co-authored-by: lea Co-authored-by: Gilver --- anda/terra/release/terra-mesa.repo | 2 +- anda/terra/release/terra-multimedia.repo | 2 +- anda/terra/release/terra-nvidia.repo | 2 +- anda/terra/release/terra-release.spec | 30 +++++++++++++++++++++--- 4 files changed, 30 insertions(+), 6 deletions(-) diff --git a/anda/terra/release/terra-mesa.repo b/anda/terra/release/terra-mesa.repo index 3df7c1d15b..b42cc4f8ff 100644 --- a/anda/terra/release/terra-mesa.repo +++ b/anda/terra/release/terra-mesa.repo @@ -7,7 +7,7 @@ type=rpm gpgcheck=1 gpgkey=https://repos.fyralabs.com/terra$releasever-mesa/key.asc repo_gpgcheck=1 -enabled=0 +enabled=1 enabled_metadata=1 countme=1 priority=80 diff --git a/anda/terra/release/terra-multimedia.repo b/anda/terra/release/terra-multimedia.repo index 72db66c238..4690e5000f 100644 --- a/anda/terra/release/terra-multimedia.repo +++ b/anda/terra/release/terra-multimedia.repo @@ -7,7 +7,7 @@ type=rpm gpgcheck=1 gpgkey=https://repos.fyralabs.com/terra$releasever-multimedia/key.asc repo_gpgcheck=1 -enabled=0 +enabled=1 enabled_metadata=1 countme=1 priority=80 diff --git a/anda/terra/release/terra-nvidia.repo b/anda/terra/release/terra-nvidia.repo index b87e80a2bb..0068692dc2 100644 --- a/anda/terra/release/terra-nvidia.repo +++ b/anda/terra/release/terra-nvidia.repo @@ -7,7 +7,7 @@ type=rpm gpgcheck=1 gpgkey=https://repos.fyralabs.com/terra$releasever-nvidia/key.asc repo_gpgcheck=1 -enabled=0 +enabled=1 enabled_metadata=1 countme=1 priority=80 diff --git a/anda/terra/release/terra-release.spec b/anda/terra/release/terra-release.spec index ab95bfdc6a..c5eb50ddc8 100644 --- a/anda/terra/release/terra-release.spec +++ b/anda/terra/release/terra-release.spec @@ -1,6 +1,6 @@ Name: terra-release Version: %{fedora} -Release: 1 +Release: 2 Summary: Release package for Terra License: MIT @@ -18,14 +18,32 @@ Requires: system-release(%{version}) Release package for Terra, containing the Terra repository configuration. %package extras -Summary: Release package for Terra Extra +Summary: Release package for Terra Extras Obsoletes: terra-release-extra < 42-3 Provides: terra-release-extra = %version-%release %description extras -Release package for Terra Extra, which is a repository with packages that might cause +Release package for Terra Extras, which is a repository with packages that might cause conflict with Fedora. +%package nvidia +Summary: Release package for the nvidia subrepo of Terra Extras + +%description nvidia +Release package for the Terra Extras nvidia subrepo, which provides nvidia drivers that might cause a conflict with Fedora. + +%package mesa +Summary: Release package for the mesa subrepo of Terra Extras + +%description mesa +Release package for the Terra Extras mesa subrepo, which provides a patched and updated version of mesa that might cause a conflict with Fedora. + +%package multimedia +Summary: Release package for the multimedia subrepo of Terra Extras + +%description multimedia +Release package for the Terra Extras multimedia subrepo, which provides codecs that might cause a conflict with Fedora. + %prep %build @@ -42,8 +60,14 @@ install -Dpm644 -t %buildroot%_sysconfdir/yum.repos.d %SOURCE4 %files extras %config(noreplace) %{_sysconfdir}/yum.repos.d/terra-extras.repo + +%files nvidia %config(noreplace) %{_sysconfdir}/yum.repos.d/terra-nvidia.repo + +%files mesa %config(noreplace) %{_sysconfdir}/yum.repos.d/terra-mesa.repo + +%files multimedia %config(noreplace) %{_sysconfdir}/yum.repos.d/terra-multimedia.repo %changelog