From d97a080da57bf1908e6cf9563fa9755fd67fe5c6 Mon Sep 17 00:00:00 2001
From: madomado <madonuko@outlook.com>
Date: Tue, 30 Apr 2024 11:12:56 +0800
Subject: [PATCH] fix: espanso

---
 anda/tools/espanso-wayland/espanso-wayland.spec | 11 ++++++-----
 anda/tools/espanso-x11/espanso-x11.spec         | 11 ++++++-----
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/anda/tools/espanso-wayland/espanso-wayland.spec b/anda/tools/espanso-wayland/espanso-wayland.spec
index 61b65d4fc8..1d7249030b 100644
--- a/anda/tools/espanso-wayland/espanso-wayland.spec
+++ b/anda/tools/espanso-wayland/espanso-wayland.spec
@@ -1,6 +1,6 @@
 Name:			espanso-wayland
 Version: 		2.2.1
-Release:		1%?dist
+Release:		2%?dist
 Summary:		Cross-platform Text Expander written in Rust for Wayland
 License:		GPL-3.0
 URL:			https://espanso.org
@@ -13,6 +13,7 @@ BuildRequires:	pkgconfig(xtst)
 BuildRequires:	pkgconfig(xkbcommon)
 BuildRequires:	pkgconfig(dbus-1)
 BuildRequires:	wxGTK-devel
+BuildRequires:	openssl-devel
 
 %description
 A cross-platform Text Expander written in Rust. A text expander is a program
@@ -29,14 +30,14 @@ cd espanso
 
 %build
 cd espanso
-#cargo_build -n -f vendored-tls -f wayland
+%cargo_build -n -f vendored-tls,"wayland" -- --package={espanso,espanso-clipboard,espanso-config,espanso-detect,espanso-engine,espanso-info,espanso-inject,espanso-ipc,espanso-kvs,espanso-mac-utils,espanso-match,espanso-migrate,espanso-modulo,espanso-package,espanso-path,espanso-render,espanso-ui}
 
 %install
-cd espanso
-%cargo_install -n -f vendored-tls -f wayland
+mkdir -p %buildroot%_bindir
+install -Dm755 target/rpm/espanso %buildroot%_bindir
 
 %files
-%_bindir/espanso
+%caps(cap_dac_override=pe) %_bindir/espanso
 
 %changelog
 %autochangelog
diff --git a/anda/tools/espanso-x11/espanso-x11.spec b/anda/tools/espanso-x11/espanso-x11.spec
index 084c95822c..542672fa8f 100644
--- a/anda/tools/espanso-x11/espanso-x11.spec
+++ b/anda/tools/espanso-x11/espanso-x11.spec
@@ -1,6 +1,6 @@
 Name:			espanso-x11
 Version: 		2.2.1
-Release:		1%?dist
+Release:		2%?dist
 Summary:		Cross-platform Text Expander written in Rust for X11
 License:		GPL-3.0
 URL:			https://espanso.org
@@ -13,6 +13,7 @@ BuildRequires:	pkgconfig(xtst)
 BuildRequires:	pkgconfig(xkbcommon)
 BuildRequires:	pkgconfig(dbus-1)
 BuildRequires:	wxGTK-devel
+BuildRequires:	openssl-devel
 
 %description
 A cross-platform Text Expander written in Rust. A text expander is a program
@@ -29,14 +30,14 @@ cd espanso
 
 %build
 cd espanso
-#cargo_build -n -f vendored-tls
+%cargo_build -n -f vendored-tls,"default" -- --package={espanso,espanso-clipboard,espanso-config,espanso-detect,espanso-engine,espanso-info,espanso-inject,espanso-ipc,espanso-kvs,espanso-mac-utils,espanso-match,espanso-migrate,espanso-modulo,espanso-package,espanso-path,espanso-render,espanso-ui}
 
 %install
-cd espanso
-%cargo_install -n -f vendored-tls
+mkdir -p %buildroot%_bindir
+install -Dm755 target/rpm/espanso %buildroot%_bindir
 
 %files
-%_bindir/espanso
+%caps(cap_dac_override=pe) %_bindir/espanso
 
 %changelog
 %autochangelog