From 241b82ea506dcc0cefd0a9549a993efd160bfdff Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Mon, 7 Oct 2024 16:06:55 +0200 Subject: [PATCH] Unify the build with RHEL There's no need to do a build just for this. --- ...d.patch => toolbox-Make-the-build-flags-match-Fedora.patch | 0 ...ora-CI.patch => toolbox-Unbreak-downstream-Fedora-CI.patch | 0 toolbox.spec | 4 ++-- 3 files changed, 2 insertions(+), 2 deletions(-) rename toolbox-Make-the-build-flags-match-Fedora-s-gobuild.patch => toolbox-Make-the-build-flags-match-Fedora.patch (100%) rename toolbox-test-system-Unbreak-downstream-Fedora-CI.patch => toolbox-Unbreak-downstream-Fedora-CI.patch (100%) diff --git a/toolbox-Make-the-build-flags-match-Fedora-s-gobuild.patch b/toolbox-Make-the-build-flags-match-Fedora.patch similarity index 100% rename from toolbox-Make-the-build-flags-match-Fedora-s-gobuild.patch rename to toolbox-Make-the-build-flags-match-Fedora.patch diff --git a/toolbox-test-system-Unbreak-downstream-Fedora-CI.patch b/toolbox-Unbreak-downstream-Fedora-CI.patch similarity index 100% rename from toolbox-test-system-Unbreak-downstream-Fedora-CI.patch rename to toolbox-Unbreak-downstream-Fedora-CI.patch diff --git a/toolbox.spec b/toolbox.spec index 86bf2c2..89d92df 100644 --- a/toolbox.spec +++ b/toolbox.spec @@ -42,11 +42,11 @@ Source0: https://github.com/containers/%{name}/releases/download/%{version Source1: %{name}.conf # Upstream -Patch0: toolbox-test-system-Unbreak-downstream-Fedora-CI.patch +Patch0: toolbox-Unbreak-downstream-Fedora-CI.patch Patch1: toolbox-Update-fallback-release-to-40-for-non-fedo.patch # Fedora specific -Patch100: toolbox-Make-the-build-flags-match-Fedora-s-gobuild.patch +Patch100: toolbox-Make-the-build-flags-match-Fedora.patch # RHEL specific Patch200: toolbox-Make-the-build-flags-match-RHEL-s-gobuild.patch