From e3b332bd34e6faa064f9ecf476c4b84841e6c843 Mon Sep 17 00:00:00 2001
From: Raboneko <119771935+raboneko@users.noreply.github.com>
Date: Sun, 29 Jun 2025 02:01:02 -0700
Subject: [PATCH] fix?(micro-default-editor): Just dep on Micro (#5710) (#5716)

* fix?(micro-default-editor): Just dep on Micro



* chore(update.rhai): Handle GPG imports



---------


(cherry picked from commit 1c8d4767abcb73a6a7506a32f3994d6492e08ac2)

Signed-off-by: Gilver <rockgrub@disroot.org>
Co-authored-by: Gilver <rockgrub@disroot.org>
---
 anda/tools/micro-default-editor/micro-default-editor.spec | 2 +-
 anda/tools/micro-default-editor/update.rhai               | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/anda/tools/micro-default-editor/micro-default-editor.spec b/anda/tools/micro-default-editor/micro-default-editor.spec
index f5fd0c0d2a..038c75f57f 100644
--- a/anda/tools/micro-default-editor/micro-default-editor.spec
+++ b/anda/tools/micro-default-editor/micro-default-editor.spec
@@ -15,7 +15,7 @@ Source2:       https://raw.githubusercontent.com/terrapkg/pkg-micro-default-edit
 # For EVR macro
 BuildRequires: anda-srpm-macros
 Requires:      default-editor
-Requires:      (micro = %{evr} or micro-nightly)
+Requires:      micro
 # All default editor packages MUST provide this
 Provides:      system-default-editor
 BuildArch:     noarch
diff --git a/anda/tools/micro-default-editor/update.rhai b/anda/tools/micro-default-editor/update.rhai
index 8926d55000..fc738f55e4 100644
--- a/anda/tools/micro-default-editor/update.rhai
+++ b/anda/tools/micro-default-editor/update.rhai
@@ -1,9 +1,9 @@
-let v = sh("dnf info micro | grep Version | grep -Eo '[0-9]+\\.[0-9]+.*'", #{"stdout": "piped"}).ctx.stdout;
+let v = sh("dnf info micro -y | grep Version | grep -Eo '[0-9]+\\.[0-9]+.*'", #{"stdout": "piped"}).ctx.stdout;
 v.pop();
 rpm.version(v);
-let r = sh("dnf info micro | grep Release | grep -Eo '[0-9]+' | head -1", #{"stdout": "piped"}).ctx.stdout;
+let r = sh("dnf info micro -y | grep Release | grep -Eo '[0-9]+' | head -1", #{"stdout": "piped"}).ctx.stdout;
 r.pop();
 rpm.f = sub(`Release: (.+?)\n`, "Release: " + r + "%{?dist}\n", rpm.f);
-let e = sh("dnf info micro | grep Epoch | grep -Eo '[0-9]+'", #{"stdout": "piped"}).ctx.stdout;
+let e = sh("dnf info micro -y | grep Epoch | grep -Eo '[0-9]+'", #{"stdout": "piped"}).ctx.stdout;
 e.pop();
 rpm.f = sub(`Epoch: (.+?)\n`, "Epoch: " + e + "\n", rpm.f);