From 037ea0e724ac1cc1ab13a9c59b08c19e67daf760 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Tue, 4 Apr 2023 00:34:08 +0200 Subject: [PATCH] Don't 'BuildRequires: pkgconfig(fish)' on RHEL ... because RHEL doesn't have fish. There's no need to do a build just for this. --- toolbox.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/toolbox.spec b/toolbox.spec index a74bf3a..2c7b55e 100644 --- a/toolbox.spec +++ b/toolbox.spec @@ -37,7 +37,6 @@ BuildRequires: go-md2man BuildRequires: golang >= 1.19.4 BuildRequires: meson >= 0.58.0 BuildRequires: pkgconfig(bash-completion) -BuildRequires: pkgconfig(fish) BuildRequires: shadow-utils-subid-devel BuildRequires: systemd BuildRequires: systemd-rpm-macros @@ -53,6 +52,7 @@ BuildRequires: golang(github.com/spf13/cobra) >= 1.3.0 BuildRequires: golang(github.com/spf13/viper) >= 1.10.1 BuildRequires: golang(golang.org/x/sys/unix) BuildRequires: golang(golang.org/x/term) +BuildRequires: pkgconfig(fish) # for tests # BuildRequires: codespell # BuildRequires: golang(github.com/stretchr/testify) >= 1.7.0 @@ -189,6 +189,7 @@ export CGO_CFLAGS="%{optflags} -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_LARGEFILE64_ %meson \ %if 0%{?rhel} + -Dfish_completions_dir=%{_datadir}/fish/vendor_completions.d \ -Dmigration_path_for_coreos_toolbox=true \ %endif -Dprofile_dir=%{_sysconfdir}/profile.d \