Accepting request 790589 from home:sgrunert

Fix build and add fish shell completion

OBS-URL: https://build.opensuse.org/request/show/790589
OBS-URL: https://build.opensuse.org/package/show/devel:kubic/cri-tools?expand=0&rev=13
This commit is contained in:
Richard Brown 2020-04-01 15:11:59 +00:00 committed by Git OBS Bridge
parent e7caf0b28b
commit 654d9a23c5

View File

@ -31,7 +31,7 @@ Source1: %{name_source1}
Source2: rpmlintrc Source2: rpmlintrc
BuildRequires: go-go-md2man BuildRequires: go-go-md2man
BuildRequires: golang-packaging BuildRequires: golang-packaging
BuildRequires: golang(API) >= 1.13 BuildRequires: golang(API) >= 1.14
# disable stripping of binaries # disable stripping of binaries
%{go_nostrip} %{go_nostrip}
@ -59,15 +59,16 @@ fi
go build $BUILDMODE_ARGS \ go build $BUILDMODE_ARGS \
-o bin/crictl \ -o bin/crictl \
-mod vendor \
-ldflags '-X %{project}/pkg/version.Version=%{version}' \ -ldflags '-X %{project}/pkg/version.Version=%{version}' \
%{project}/cmd/crictl %{project}/cmd/crictl
go test $BUILDMODE_ARGS \ go test $BUILDMODE_ARGS \
-o bin/critest \ -o bin/critest \
-mod vendor \
-ldflags '-X %{project}/pkg/version.Version=%{version}' \ -ldflags '-X %{project}/pkg/version.Version=%{version}' \
-c %{project}/cmd/critest -c %{project}/cmd/critest
# compile the manpages # compile the manpages
for md in docs/*.md for md in docs/*.md
do do
@ -76,8 +77,9 @@ done
rename '.md' '.1' docs/* rename '.md' '.1' docs/*
# generate auto-completions # generate auto-completions
./bin/crictl completion bash > crictl-completion-bash bin/crictl completion bash > crictl-completion-bash
./bin/crictl completion zsh > crictl-completion-zsh bin/crictl completion zsh > crictl-completion-zsh
bin/crictl completion fish > crictl.fish
%install %install
cd $HOME/go/src/%{project} cd $HOME/go/src/%{project}
@ -89,6 +91,7 @@ install -D -m 0644 docs/benchmark.1 %{buildroot}/%{_mandir}/man1/critest-benchma
install -D -m 0644 docs/validation.1 %{buildroot}/%{_mandir}/man1/critest-validation.1 install -D -m 0644 docs/validation.1 %{buildroot}/%{_mandir}/man1/critest-validation.1
install -D -m 0644 crictl-completion-bash %{buildroot}/%{_datadir}/bash-completion/completions/crictl install -D -m 0644 crictl-completion-bash %{buildroot}/%{_datadir}/bash-completion/completions/crictl
install -D -m 0644 crictl-completion-zsh %{buildroot}/%{_datadir}/zsh/site-functions/_crictl install -D -m 0644 crictl-completion-zsh %{buildroot}/%{_datadir}/zsh/site-functions/_crictl
install -D -m 0644 crictl.fish %{buildroot}/%{_datadir}/fish/completions/crictl.fish
install -D -m 0644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/%{name_source1} install -D -m 0644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/%{name_source1}
%files %files
@ -97,6 +100,9 @@ install -D -m 0644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/%{name_source1}
%{_mandir}/man1/* %{_mandir}/man1/*
%{_datadir}/bash-completion/completions/crictl %{_datadir}/bash-completion/completions/crictl
%{_datadir}/zsh %{_datadir}/zsh
%{_datadir}/fish
%{_datadir}/fish/completions
%{_datadir}/fish/completions/crictl.fish
%config(noreplace) %{_sysconfdir}/%{name_source1} %config(noreplace) %{_sysconfdir}/%{name_source1}
%license LICENSE %license LICENSE