From 8fde0c9080dfa5f8d57588727adee616bf85c42d Mon Sep 17 00:00:00 2001
From: Raboneko <119771935+raboneko@users.noreply.github.com>
Date: Sat, 24 Aug 2024 19:34:38 -0700
Subject: [PATCH] fix version formatting for cros-keyboard-map (#1989) (#1990)

* fix version formatting

* fix version formatting in rhai script too

(cherry picked from commit 36362e035c16929ceafeeb34f5abed2f35cb1359)

Co-authored-by: june <159748074+june-fish@users.noreply.github.com>
---
 anda/system/cros-keyboard-map/cros-keyboard-map.spec | 6 +++---
 anda/system/cros-keyboard-map/update.rhai            | 3 +--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/anda/system/cros-keyboard-map/cros-keyboard-map.spec b/anda/system/cros-keyboard-map/cros-keyboard-map.spec
index f65c2b72b2..300f6139e6 100644
--- a/anda/system/cros-keyboard-map/cros-keyboard-map.spec
+++ b/anda/system/cros-keyboard-map/cros-keyboard-map.spec
@@ -1,16 +1,16 @@
+%global commit_date 20240824
+
 %global tree_commit b2e69368f96bdf7562dc1a95a0d863c794756842
-%global tree_commit_date 20240814
 %global tree_shortcommit %(c=%{tree_commit}; echo ${c:0:7})
 
 %global um_commit 46892acafb2fff3f3ace425d4694382c92645feb
-%global um_commit_date 20240824
 %global um_shortcommit %(c=%{um_commit}; echo ${c:0:7})
 
 %global debug_package %{nil}
 %define __os_install_post %{nil}
 
 Name:           cros-keyboard-map
-Version:        %tree_commit_date.%tree_shortcommit.%um_commit_date.%um_shortcommit
+Version:        %commit_date.%tree_shortcommit.%um_shortcommit
 Release:        1%?dist
 
 License:        BSD-3-Clause and GPLv3
diff --git a/anda/system/cros-keyboard-map/update.rhai b/anda/system/cros-keyboard-map/update.rhai
index 8b659b08cd..aef26dd922 100644
--- a/anda/system/cros-keyboard-map/update.rhai
+++ b/anda/system/cros-keyboard-map/update.rhai
@@ -3,7 +3,6 @@ if filters.contains("nightly") {
   rpm.global("commit", gh_commit("WeirdTreeThing/cros-keyboard-map"));
   if rpm.changed() {
     rpm.release();
-    rpm.global("tree_commit_date", date());
-    rpm.global("um_commit_date", date());
+    rpm.global("commit_date", date());
   }
 }