rpms/toolbox
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Don't 'BuildRequires: pkgconfig(fish)' on RHEL

Browse Source 
... because RHEL doesn't have fish.

There's no need to do a build just for this.
This commit is contained in:
Debarshi Ray 2023-04-04 00:34:08 +02:00
parent ef153bba41
commit 037ea0e724
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
toolbox.spec
View File

@ -37,7 +37,6 @@ BuildRequires: go-md2man
BuildRequires: golang >= 1.19.4 BuildRequires: golang >= 1.19.4
BuildRequires: meson >= 0.58.0 BuildRequires: meson >= 0.58.0
BuildRequires: pkgconfig(bash-completion) BuildRequires: pkgconfig(bash-completion)
BuildRequires: pkgconfig(fish)
BuildRequires: shadow-utils-subid-devel BuildRequires: shadow-utils-subid-devel
BuildRequires: systemd BuildRequires: systemd
BuildRequires: systemd-rpm-macros 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(github.com/spf13/viper) >= 1.10.1
BuildRequires: golang(golang.org/x/sys/unix) BuildRequires: golang(golang.org/x/sys/unix)
BuildRequires: golang(golang.org/x/term) BuildRequires: golang(golang.org/x/term)
BuildRequires: pkgconfig(fish)
# for tests # for tests
# BuildRequires: codespell # BuildRequires: codespell
# BuildRequires: golang(github.com/stretchr/testify) >= 1.7.0 # 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 \ %meson \
%if 0%{?rhel} %if 0%{?rhel}
-Dfish_completions_dir=%{_datadir}/fish/vendor_completions.d \
-Dmigration_path_for_coreos_toolbox=true \ -Dmigration_path_for_coreos_toolbox=true \
%endif %endif
-Dprofile_dir=%{_sysconfdir}/profile.d \ -Dprofile_dir=%{_sysconfdir}/profile.d \