From c42f9731da87ba5b6cf73b3793bbc2eb85ffb9af Mon Sep 17 00:00:00 2001 From: Raboneko <119771935+raboneko@users.noreply.github.com> Date: Sat, 3 May 2025 00:58:28 -0700 Subject: [PATCH] chore: Rename readymade-nightly to readymade-git (#4626) (#4635) (cherry picked from commit 2d8748f4b1a2664939d27b1932791279bdc9b675) Co-authored-by: Gilver --- anda/system/readymade/{nightly => git}/anda.hcl | 2 +- .../readymade-nightly.spec => git/readymade-git.spec} | 8 +++++--- anda/system/readymade/{nightly => git}/update.rhai | 0 3 files changed, 6 insertions(+), 4 deletions(-) rename anda/system/readymade/{nightly => git}/anda.hcl (54%) rename anda/system/readymade/{nightly/readymade-nightly.spec => git/readymade-git.spec} (87%) rename anda/system/readymade/{nightly => git}/update.rhai (100%) diff --git a/anda/system/readymade/nightly/anda.hcl b/anda/system/readymade/git/anda.hcl similarity index 54% rename from anda/system/readymade/nightly/anda.hcl rename to anda/system/readymade/git/anda.hcl index 9a6037464b..e8898266d1 100644 --- a/anda/system/readymade/nightly/anda.hcl +++ b/anda/system/readymade/git/anda.hcl @@ -1,6 +1,6 @@ project pkg { rpm { - spec = "readymade-nightly.spec" + spec = "readymade-git.spec" } labels { } diff --git a/anda/system/readymade/nightly/readymade-nightly.spec b/anda/system/readymade/git/readymade-git.spec similarity index 87% rename from anda/system/readymade/nightly/readymade-nightly.spec rename to anda/system/readymade/git/readymade-git.spec index 855da97cba..67a2779a6b 100644 --- a/anda/system/readymade/nightly/readymade-nightly.spec +++ b/anda/system/readymade/git/readymade-git.spec @@ -2,7 +2,7 @@ %global commit_date 20250502 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -Name: readymade-nightly +Name: readymade-git Version: %commit_date.%shortcommit Release: 1%?dist Summary: Install ready-made distribution images! @@ -15,6 +15,7 @@ BuildRequires: pkgconfig(gnome-desktop-4) BuildRequires: clang-devel BuildRequires: cmake Conflicts: readymade +Obsoletes: readymade-nightly < 20250502.4dc78ec-3 Requires: efibootmgr @@ -26,9 +27,10 @@ It is created as a replacement to Red Hat's Anaconda installer. %package config-ultramarine Summary: Readymade Configuration for Ultramarine Linux -Requires: readymade-nightly -Provides: readymade-nightly-config +Requires: readymade-git +Provides: readymade-git-config Conflicts: readymade-config-ultramarine +Obsoletes: readymade-nightly-config-ultramarine < 20250502.4dc78ec-3 %description config-ultramarine This package contains the configuration files for Readymade to install Ultramarine Linux. diff --git a/anda/system/readymade/nightly/update.rhai b/anda/system/readymade/git/update.rhai similarity index 100% rename from anda/system/readymade/nightly/update.rhai rename to anda/system/readymade/git/update.rhai