From bef0d3d8d49c988f525cc08fccedfc5346cfd1e0 Mon Sep 17 00:00:00 2001 From: Raboneko <119771935+raboneko@users.noreply.github.com> Date: Tue, 10 Feb 2026 12:30:42 -0800 Subject: [PATCH] fix(holyc): hcc --version output and update script (#9790) (#9793) * fix(holyc): hcc --version output and update script * cleanup: Remove %check (cherry picked from commit 4564f514132c85125d838304b62555858555b7b4) Co-authored-by: Gilver --- anda/langs/holyc/{ => holyc}/anda.hcl | 0 anda/langs/holyc/{ => holyc}/holyc.spec | 10 ++++++++-- anda/langs/holyc/{ => holyc}/update.rhai | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) rename anda/langs/holyc/{ => holyc}/anda.hcl (100%) rename anda/langs/holyc/{ => holyc}/holyc.spec (67%) rename anda/langs/holyc/{ => holyc}/update.rhai (84%) diff --git a/anda/langs/holyc/anda.hcl b/anda/langs/holyc/holyc/anda.hcl similarity index 100% rename from anda/langs/holyc/anda.hcl rename to anda/langs/holyc/holyc/anda.hcl diff --git a/anda/langs/holyc/holyc.spec b/anda/langs/holyc/holyc/holyc.spec similarity index 67% rename from anda/langs/holyc/holyc.spec rename to anda/langs/holyc/holyc/holyc.spec index 8eda6835c1..f9dfd8fdb0 100644 --- a/anda/langs/holyc/holyc.spec +++ b/anda/langs/holyc/holyc/holyc.spec @@ -2,7 +2,7 @@ Name: holyc Version: %{ver}~beta -Release: 1%{?dist} +Release: 2%{?dist} Summary: HolyC compiler and transpiler License: BSD-2-Clause URL: https://holyc-lang.com @@ -19,7 +19,13 @@ HolyC is a fun recreational programming language designed by Terry A. Davis. Originally implemented in TempleOS as a general purpose programming language and scripting language for all manner of tasks. %prep -%autosetup -n %{name}-lang-beta-v%{ver}/src +# Currently needed to fetch the commit hash for hcc --version +%git_clone https://github.com/Jamesbarford/holyc-lang.git beta-v%{ver} +%setup -T -D -n holyc-lang/src +# Make packaged versions of HolyC report the correct Git hash +sed -i 's|git rev-parse main|git rev-parse HEAD|g' CMakeLists.txt +# Make the binary correctly report its installed location as /usr/bin instead of /usr +sed -i 's|binary: %s/hcc|binary: %{_bindir}/hcc|g' cli.c %build %cmake \ diff --git a/anda/langs/holyc/update.rhai b/anda/langs/holyc/holyc/update.rhai similarity index 84% rename from anda/langs/holyc/update.rhai rename to anda/langs/holyc/holyc/update.rhai index 3e13ecc349..3ad7b1d940 100644 --- a/anda/langs/holyc/update.rhai +++ b/anda/langs/holyc/holyc/update.rhai @@ -3,5 +3,5 @@ v.crop(6); rpm.global("ver", v); if rpm.changed() { - rpm.release() + rpm.release(); }