diff --git a/oci-seccomp-bpf-hook.spec b/oci-seccomp-bpf-hook.spec index da3df70..6478aa2 100644 --- a/oci-seccomp-bpf-hook.spec +++ b/oci-seccomp-bpf-hook.spec @@ -7,30 +7,18 @@ %global debug_package %{nil} %endif -%global provider github -%global provider_tld com -%global project containers -%global repo oci-seccomp-bpf-hook -# https://github.com/containers/oci-seccomp-bpf-hook -%global import_path %{provider}.%{provider_tld}/%{project}/%{repo} -%global git0 https://%{import_path} - -%global built_tag v1.2.10 -%global built_tag_strip %(b=%{built_tag}; echo ${b:1}) -%global gen_version %(b=%{built_tag_strip}; echo ${b/-/"~"}) - # use the same arch definitions as present in the bcc package ExclusiveArch: x86_64 %{power64} aarch64 s390x armv7hl -Name: %{repo} -Version: %{gen_version} +Name: oci-seccomp-bpf-hook +Version: 1.2.11 License: Apache-2.0 and BSD-2-Clause and BSD-3-Clause and ISC and MIT -Release: %autorelease +Release: 1%{?dist} ExclusiveArch: %{golang_arches_future} Summary: OCI Hook to generate seccomp json files based on EBF syscalls used by container -URL: %{git0} +URL: https://github.com/containers/oci-seccomp-bpf-hook # Tarball fetched from upstream -Source0: %{url}/archive/%{built_tag}.tar.gz +Source0: https://github.com/containers/oci-seccomp-bpf-hook/archive/v%{version}.tar.gz BuildRequires: golang BuildRequires: go-md2man BuildRequires: go-rpm-macros @@ -71,7 +59,7 @@ This subpackage contains system tests for %{name}. It's only meant for gating tests. End user / customer usage cases are not supported. %prep -%autosetup -Sgit -n %{name}-%{built_tag_strip} +%autosetup -Sgit -n %{name}-%{version} sed -i 's;HOOK_BIN_DIR;%{_libexecdir}/oci/hooks.d;' %{name}.json sed -i '/$(HOOK_DIR)\/%{name}.json/d' Makefile @@ -92,14 +80,14 @@ export GOPATH=$(pwd):$(pwd)/_build mkdir _build cd _build -mkdir -p src/%{provider}.%{provider_tld}/%{project} -ln -s ../../../../ src/%{import_path} +mkdir -p src/github.com/containers/ +ln -s ../../../../ src/github.com/containers/oci-seccomp-bpf-hook cd .. ln -s vendor src export GOPATH=$(pwd)/_build:$(pwd) export LDFLAGS="-X main.version=%{version}" -%gobuild -o bin/%{name} %{import_path} +%gobuild -o bin/%{name} github.com/containers/oci-seccomp-bpf-hook cd docs go-md2man -in %{name}.md -out %{name}.1 @@ -126,7 +114,7 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %global gotest go test %endif -%gotest %{import_path}/src/%{name} +%gotest github.com/containers/oci-seccomp-bpf-hook/src/%{name} %endif #define license tag if not already defined @@ -145,4 +133,7 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %{_datadir}/%{name}/test %changelog -%autochangelog +* Thu Apr 03 2025 Jindrich Novy - 1.2.11-1 +- update to https://github.com/containers/oci-seccomp-bpf-hook/releases/tag/v1.2.11 +- simplify spec +- Resolves: RHEL-85838 diff --git a/sources b/sources index f35f7c5..0f21d6f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v1.2.10.tar.gz) = 184045dbbc2d6a08c49939f9fb1dc1ed1c24d5e33005f2f8f3d4d09d2f2edac0f97cf30c27b5fb0afa478a2eb377657952de505076bbddf4be013c11e1c8bac3 +SHA512 (v1.2.11.tar.gz) = de52232add2d001b6cee891beb5f2c989c70bc6792892f6b7881b5e58c3f3a8402953635ada08bff297fb4868b78fe22e17fa18235d835569e78ea3e1b30b59d