From 78592a6ca6f2e8e9ce5781cc37f38e412f59e59c Mon Sep 17 00:00:00 2001
From: sadlerm4 <sad_lerm@hotmail.com>
Date: Thu, 13 Feb 2025 23:27:31 +1100
Subject: [PATCH] fix(flow): build release not from latest commit now that
 upstream is versioned (#3299) (#3305)

---------

Signed-off-by: sadlerm4 <sad_lerm@hotmail.com>
---
 anda/devs/flow/anda.hcl                  |  5 +---
 anda/devs/flow/flow-control-nightly.spec | 30 ------------------------
 anda/devs/flow/flow-control.spec         | 28 ++++++++++++++++++++++
 anda/devs/flow/update.rhai               |  8 +------
 4 files changed, 30 insertions(+), 41 deletions(-)
 delete mode 100644 anda/devs/flow/flow-control-nightly.spec
 create mode 100644 anda/devs/flow/flow-control.spec

diff --git a/anda/devs/flow/anda.hcl b/anda/devs/flow/anda.hcl
index 7542fe48ea..705fb5dda6 100644
--- a/anda/devs/flow/anda.hcl
+++ b/anda/devs/flow/anda.hcl
@@ -1,8 +1,5 @@
 project pkg {
     rpm {
-        spec = "flow-control-nightly.spec"
-    }
-    labels {
-        nightly = 1
+        spec = "flow-control.spec"
     }
 }
diff --git a/anda/devs/flow/flow-control-nightly.spec b/anda/devs/flow/flow-control-nightly.spec
deleted file mode 100644
index 92858683d3..0000000000
--- a/anda/devs/flow/flow-control-nightly.spec
+++ /dev/null
@@ -1,30 +0,0 @@
-%global commit e6e0301a782989782464e5f141ff4b4030a23c38
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global commit_date 20250130
-
-Name:           flow-control-nightly
-Version:        %commit_date.%shortcommit
-Release:        1%?dist
-Summary:        A programmer's text editor 
-License:        MIT
-URL:            https://github.com/neurocyte/flow
-Source0:        %url/archive/%commit.tar.gz
-BuildRequires:  zig
-Provides:       flow = %version-%release
-
-%description
-%summary.
-
-%prep
-%autosetup -n flow-%commit
-
-%build
-zig build -Doptimize=ReleaseFast --release=fast
-
-%install
-install -Dpm755 zig-out/bin/flow %buildroot%_bindir/flow
-
-%files
-%doc README.md help.md
-%license LICENSE
-%_bindir/flow
diff --git a/anda/devs/flow/flow-control.spec b/anda/devs/flow/flow-control.spec
new file mode 100644
index 0000000000..c1e005b0f2
--- /dev/null
+++ b/anda/devs/flow/flow-control.spec
@@ -0,0 +1,28 @@
+Name:           flow-control
+Epoch:          1
+Version:        0.3.3
+Release:        1%?dist
+Summary:        A programmer's text editor
+License:        MIT
+URL:            https://github.com/neurocyte/flow
+BuildRequires:  zig
+BuildRequires:  anda-srpm-macros
+Provides:       flow = %epoch:%version-%release
+Obsoletes:      flow-control-nightly < 20250212.9999999
+
+%description
+%summary.
+
+%prep
+%git_clone %url v%version
+
+%build
+zig build -Doptimize=ReleaseFast --release=fast
+
+%install
+install -Dpm755 zig-out/bin/flow %buildroot%_bindir/flow
+
+%files
+%doc README.md help.md
+%license LICENSE
+%_bindir/flow
diff --git a/anda/devs/flow/update.rhai b/anda/devs/flow/update.rhai
index 31f698e529..9693a0dbdf 100644
--- a/anda/devs/flow/update.rhai
+++ b/anda/devs/flow/update.rhai
@@ -1,7 +1 @@
-if filters.contains("nightly") {
-    rpm.global("commit", gh_commit("neurocyte/flow"));
-    if rpm.changed() {
-        rpm.release();
-        rpm.global("commit_date", date());
-    }
-}
+rpm.version(gh("neurocyte/flow"));