From cf341cd0394807cf81ba7bdde9085f99ab7fd025 Mon Sep 17 00:00:00 2001 From: Gil Date: Mon, 20 Jan 2025 04:54:55 -0600 Subject: [PATCH] fix(walker): Revert #3051, follow upstream build guidelines, enable debug packages (#3075) * Revert 26f39a3 Signed-off-by: Gil * Bump release Signed-off-by: Gil * Fix: Redo spec to follow upstream build guidelines and build correctly --------- Signed-off-by: Gil --- .../walker/golang-github-abenz1267-walker.spec | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/anda/desktops/waylands/walker/golang-github-abenz1267-walker.spec b/anda/desktops/waylands/walker/golang-github-abenz1267-walker.spec index 6e358b27f0..408072fb47 100644 --- a/anda/desktops/waylands/walker/golang-github-abenz1267-walker.spec +++ b/anda/desktops/waylands/walker/golang-github-abenz1267-walker.spec @@ -2,8 +2,6 @@ %bcond check 0 %bcond bootstrap 0 -%global debug_package %{nil} - %if %{with bootstrap} %global __requires_exclude %{?__requires_exclude:%{__requires_exclude}|}^golang\\(.*\\)$ %endif @@ -21,7 +19,7 @@ Multi-Purpose Launcher with a lot of features. Highly Customizable and fast.} %global godocs README.md cmd/version.txt Name: walker -Release: 1%?dist +Release: 2%?dist Summary: Multi-Purpose Launcher with a lot of features. Highly Customizable and fast License: MIT @@ -30,7 +28,7 @@ Source: %{gosource} Provides: golang-github-abenz1267-walker = %version-%release Obsoletes: golang-github-abenz1267-walker < 0.11.4-2 Packager: madonuko -Conflicts: gtk4-layer-shell +Requires: gtk4-layer-shell BuildRequires: anda-srpm-macros BuildRequires: gtk4-devel BuildRequires: gtk4-layer-shell-devel @@ -43,18 +41,19 @@ BuildRequires: pkgconfig(vips) %prep %goprep -A -%autopatch -p1 %go_prep_online +mv {LICENSE,README.md} cmd +%setup -T -D -n %{name}-%{version}/cmd %build -%go_build_online cmd/walker.go +go build -x -o walker %install #gopkginstall %if %{without bootstrap} -install -m 0755 -vd %{buildroot}%{_bindir} -install -m 0755 -vp build/bin/cmd/walker.go %{buildroot}%{_bindir}/walker +install -m 0755 -vd %{buildroot}%{_bindir} +install -m 0755 -vp walker %{buildroot}%{_bindir}/walker %endif %if %{without bootstrap}