[packages/fish] bring back use of %cmake macro and set rust options properly

atler atler at pld-linux.org
Fri Oct 24 20:30:09 CEST 2025


commit 347b46806bbabf61ba298677bd1c196b61f9e144
Author: Jan Palus <atler at pld-linux.org>
Date:   Fri Oct 24 20:03:37 2025 +0200

    bring back use of %cmake macro and set rust options properly

 fish.spec | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/fish.spec b/fish.spec
index 17f9821..828636c 100644
--- a/fish.spec
+++ b/fish.spec
@@ -16,7 +16,7 @@ BuildRequires:	gettext-tools
 BuildRequires:	libstdc++-devel >= 6:4.8.1
 BuildRequires:	pcre2-32-devel >= 10.21
 BuildRequires:	rpm-build >= 4.6
-BuildRequires:	rpmbuild(macros) >= 1.605
+BuildRequires:	rpmbuild(macros) >= 2.020
 BuildRequires:	rust
 BuildRequires:	sphinx-pdg
 BuildRequires:	tar >= 1:1.22
@@ -58,14 +58,17 @@ Pliki programistyczne dla fish.
 %{__sed} -i -e '1s,/usr/bin/env python3$,%{__python3},' share/tools/create_manpage_completions.py
 
 %build
-%{__cmake} -B build \
-	-DCMAKE_INSTALL_PREFIX=%{_prefix} \
-	-DCMAKE_INSTALL_SYSCONFDIR=%{_sysconfdir}
+%cmake -B build \
+	-DRust_COMPILER:PATH="%{__rustc}" \
+	-DRust_CARGO:PATH="%{__cargo}" \
+	-DRust_CARGO_TARGET="%{rust_target}" \
+	-DCARGO_FLAGS:LIST="%(printf '%s' '%__cargo_common_opts --release' | tr '[[:space:]]' ';')"
 
 %{__make} -C build
 
 %install
 rm -rf $RPM_BUILD_ROOT
+%{set_build_flags};
 %{__make} -C build install \
 	DESTDIR=$RPM_BUILD_ROOT
 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/fish.git/commitdiff/e3e42b6c17256e97140fb1d972071cd5e599e72b



More information about the pld-cvs-commit mailing list