From cf1fc55b978e2a59510ef29f8f67d0560f2c38df Mon Sep 17 00:00:00 2001 From: Sergey Zhemoytel Date: Sun, 2 Apr 2023 00:33:34 +0000 Subject: [PATCH] 1.1.5 --- .abf.yml | 2 +- runc.spec | 42 ++++++++++++++---------------------------- 2 files changed, 15 insertions(+), 29 deletions(-) diff --git a/.abf.yml b/.abf.yml index 2d7d8e2..3a7b333 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,2 +1,2 @@ sources: - runc-1.0.2.tar.gz: 3a0bb2a9506981b5a2204fb1591afc827ecaeb45 + runc-1.1.5.tar.gz: ad45aea7b8f05ffd428bc9fa1aa0ebec76604479 diff --git a/runc.spec b/runc.spec index 9229fd1..5b7334f 100644 --- a/runc.spec +++ b/runc.spec @@ -3,25 +3,27 @@ Summary: CLI for running Open Containers Name: runc -Version: 1.0.2 -Release: 2 +Version: 1.1.5 +Release: 1 Epoch: 1 License: ASL 2.0 Group: System/Kernel and hardware -Url: https://github.com/opencontainers/runc -Source0: https://github.com/opencontainers/runc/archive/refs/tags/v%{version}.tar.gz?/%{name}-%{version}.tar.gz +URL: https://github.com/opencontainers/runc +Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz +Source100: %{name}.rpmlintrc BuildRequires: go-md2man BuildRequires: golang -BuildRequires: git +BuildRequires: git-core BuildRequires: glibc-static-devel BuildRequires: pkgconfig(libseccomp) +BuildRequires: upx # need xz to work with ubuntu images # https://bugzilla.redhat.com/show_bug.cgi?id=1045220 Requires: xz # https://bugzilla.redhat.com/show_bug.cgi?id=1034919 # No longer needed in Fedora because of libcontainer -Requires: libcgroup-tools +Requires: cgroup Requires: e2fsprogs Requires: iptables @@ -33,6 +35,8 @@ in accordance with the Open Container Initiative's specifications, and to manage containers running under runc. %files +%doc README.md LICENSE docs +%{_sbindir}/%{name} %{_bindir}/%{name} %{_bindir}/docker-%{name} %{_mandir}/man8/%{name}* @@ -44,32 +48,14 @@ and to manage containers running under runc. %setup -q %build -mkdir -p GOPATH -pushd GOPATH - mkdir -p src/github.com/opencontainers - ln -s $(dirs +1 -l) src/%{import_path} -popd +%make man all -pushd GOPATH/src/%{import_path} -export GOPATH=%{_builddir}:$(pwd)/GOPATH - -make BUILDTAGS="seccomp selinux" all - -sed -i '/\#\!\/bin\/bash/d' contrib/completions/bash/%{name} -popd +upx ./%{name} %install +make PREFIX=%{_prefix} DESTDIR=%{buildroot} install install-bash install-man + install -d -p %{buildroot}%{_bindir} install -p -m 755 %{name} %{buildroot}%{_bindir} -# generate man pages -man/md2man-all.sh - -# install man pages -install -d -p %{buildroot}%{_mandir}/man8 -install -p -m 0644 man/man8/*.8 %{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 - ln -s %{name} %{buildroot}%{_bindir}/docker-%{name}