From 3a69abed76bf11cf0f42a482e93a2cc0af4e8ca6 Mon Sep 17 00:00:00 2001
From: Raboneko <119771935+raboneko@users.noreply.github.com>
Date: Sat, 1 Mar 2025 16:11:18 -0800
Subject: [PATCH] fix: micro-nightly (#3563) (#3639)

* fix: micro-nightly

spec cleanup
follow new terra go packaging guidelines
use crop() in update.rhai

* builddir is a sub

* ohhh

(cherry picked from commit c6ab8da6206162d1f24cacba364d4b75b9c4c69e)

Co-authored-by: sadlerm4 <sad_lerm@hotmail.com>
---
 anda/devs/micro/micro-nightly.spec | 55 +++++++++++++-----------------
 anda/devs/micro/update.rhai        |  4 ++-
 2 files changed, 27 insertions(+), 32 deletions(-)

diff --git a/anda/devs/micro/micro-nightly.spec b/anda/devs/micro/micro-nightly.spec
index bda62c22f0..be0c82a6f4 100644
--- a/anda/devs/micro/micro-nightly.spec
+++ b/anda/devs/micro/micro-nightly.spec
@@ -34,7 +34,7 @@ micro is a terminal-based text editor that aims to be easy to use and intuitive,
                         runtime/help/tutorial.md
 
 Name:           micro.nightly
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A modern and intuitive terminal-based text editor
 
 License:        MIT
@@ -43,6 +43,9 @@ Packager:       sadlerm <lerm@chromebooks.lol>
 
 BuildRequires:  anda-srpm-macros
 
+Recommends:     wl-clipboard
+Recommends:     (xclip or xsel)
+
 Provides:       micro-nightly = %{version}-%{release}
 Provides:       micro
 Conflicts:      micro
@@ -51,65 +54,55 @@ Conflicts:      micro
 
 %gopkg
 
-%prep
-git clone --recurse-submodules -q -j$(nproc) %{gourl} -b master && cd micro
-if ! [ %{shortcommit} = $(git rev-parse --short=7 HEAD) ]; then
-  printf "Commit mismatch, exiting..." >&2
-  exit 1
-fi
+%global buildsubdir micro-%{version}
 
+%prep
+git clone --recurse-submodules -q %{gourl} micro-%{version}
+cd %{builddir}/micro-%{version} && git checkout -q %{commit_hash}
+%gomkdir
 %go_prep_online
 
 %build
-cd micro
 %if %{without bootstrap}
 go generate ./runtime
 
 MICRO_VERSION=$(go run ./tools/build-version.go)
 MICRO_DATE=$(date --date=%{commit_date} +"%%B %%d, %%Y")
 
-go build -buildmode pie -compiler gc -tags="rpm_crashtraceback ${GO_BUILDTAGS-${BUILDTAGS-}}" -a -x \
-  -ldflags "-X internal/util.version=${MICRO_VERSION} \
-            -X internal/util.hash=%{shortcommit} \
-            -X 'internal/util.date=${MICRO_DATE}' \
-            -B 0x$(echo "%{name}-%{version}-%{release}-${SOURCE_DATE_EPOCH:-}" | sha1sum | cut -d ' ' -f1) \
-            -compressdwarf=false -linkmode=external \
-            -extldflags '-Wl,-z,relro -Wl,--as-needed -Wl,-z,pack-relative-relocs -Wl,-z,now \
-                         -specs=/usr/lib/rpm/redhat/redhat-hardened-ld -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 \
-                         -Wl,--build-id=sha1'" \
-  -o ./micro ./cmd/micro/
+LDFLAGS="-X internal/util.version=${MICRO_VERSION} \
+         -X internal/util.hash=%{shortcommit} \
+         -X 'internal/util.date=${MICRO_DATE}'"
+
+%define gomodulesmode GO111MODULE=on
+%gobuild -o %{gobuilddir}/bin/micro ./cmd/micro
 %endif
 
 %install
 %if %{without bootstrap}
-install -m 0755 -vd                                        %{buildroot}%{_bindir} \
-                                                           %{buildroot}%{_mandir}/man1 \
-                                                           %{buildroot}%{_datadir}/applications
-
-install -m 0755 -vp ./micro/micro                          %{buildroot}%{_bindir}/
-install -m 0644 -vp ./micro/assets/packaging/micro.1       %{buildroot}%{_mandir}/man1/
-install -m 0644 -vp ./micro/assets/packaging/micro.desktop %{buildroot}%{_datadir}/applications/
+install -Dm755 %{gobuilddir}/bin/micro        -t %{buildroot}%{_bindir}
+install -Dm644 assets/packaging/micro.1       -t %{buildroot}%{_mandir}/man1
+install -Dm644 assets/packaging/micro.desktop -t %{buildroot}%{_datadir}/applications
+install -Dm644 assets/micro-logo-mark.svg        %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/micro.svg
 
 # for %%doc packaging
-mkdir -v ./micro/help
-mv -v ./micro/runtime/help/* ./micro/help/
+mv -v ./runtime/help .
 %endif
 
 %if %{without bootstrap}
 %if %{with check}
 %check
-cd micro
-%gotest ./internal/... ./cmd/micro/... 
+%gotest ./internal/... ./cmd/micro/...
 %endif
 %endif
 
 %if %{without bootstrap}
 %files
-%license micro/LICENSE micro/LICENSE-THIRD-PARTY
-%doc micro/README.md micro/help
+%license LICENSE LICENSE-THIRD-PARTY
+%doc README.md help
 %{_bindir}/micro
 %{_mandir}/man1/micro.1.gz
 %{_datadir}/applications/micro.desktop
+%{_datadir}/icons/hicolor/scalable/apps/micro.svg
 %endif
 
 %changelog
diff --git a/anda/devs/micro/update.rhai b/anda/devs/micro/update.rhai
index 0fc1845fe8..f87863b9e7 100644
--- a/anda/devs/micro/update.rhai
+++ b/anda/devs/micro/update.rhai
@@ -1,5 +1,7 @@
 rpm.global("commit_hash", gh_commit("zyedidia/micro"));
+let v = gh("zyedidia/micro");
 if rpm.changed() {
     rpm.global("commit_date", date());
-    rpm.global("ver", gh("zyedidia/micro"));
+    v.crop(1);
+    rpm.global("ver", v);
 }