From b21c08e464097b1303c3e6466bfc8f832d8a06d8 Mon Sep 17 00:00:00 2001 From: Jindrich Novy Date: Mon, 26 Jul 2021 09:54:39 +0200 Subject: [PATCH] runc-1.0.1-2.el9 - use Makefile - Related: #1970747 Signed-off-by: Jindrich Novy --- runc.spec | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/runc.spec b/runc.spec index 493913f..5011066 100644 --- a/runc.spec +++ b/runc.spec @@ -22,7 +22,7 @@ go build -buildmode pie -compiler gc -tags="rpm_crashtraceback libtrust_openssl Name: %{repo} Version: 1.0.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: CLI for running Open Containers # https://fedoraproject.org/wiki/PackagingDrafts/Go#Go_Language_Architectures #ExclusiveArch: %%{go_arches} @@ -32,7 +32,7 @@ ExcludeArch: %{ix86} License: ASL 2.0 URL: %{git0} Source0: %{git0}/archive/v%{version}.tar.gz -Provides: oci-runtime +Provides: oci-runtime = 1 BuildRequires: golang >= 1.12.12-4 BuildRequires: git BuildRequires: go-md2man @@ -60,22 +60,15 @@ export GO111MODULE=off export GOPATH=%{gopath}:$(pwd)/GOPATH export CGO_CFLAGS="%{optflags} -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64" export BUILDTAGS="selinux seccomp" -%gobuild -o %{name} %{import_path} +export COMMIT="" +make pushd man ./md2man-all.sh popd %install -install -d -p %{buildroot}%{_bindir} -install -p -m 755 %{name} %{buildroot}%{_bindir} - -# install man pages -install -d -p %{buildroot}%{_mandir}/man8 -install -p -m 644 man/man8/* %{buildroot}%{_mandir}/man8 -# install bash completion -install -d -p %{buildroot}%{_datadir}/bash-completion/completions -install -p -m 0644 contrib/completions/bash/%{name} %{buildroot}%{_datadir}/bash-completion/completions +make install install-man install-bash DESTDIR=$RPM_BUILD_ROOT PREFIX=%{_prefix} LIBDIR=%{_libdir} BINDIR=%{_bindir} %check @@ -90,6 +83,10 @@ install -p -m 0644 contrib/completions/bash/%{name} %{buildroot}%{_datadir}/bash %{_datadir}/bash-completion/completions/%{name} %changelog +* Mon Jul 26 2021 Jindrich Novy - 1.0.1-2 +- use Makefile +- Related: #1970747 + * Mon Jul 19 2021 Jindrich Novy - 1.0.1-1 - update to https://github.com/opencontainers/runc/releases/tag/v1.0.1 - Related: #1970747