bump to 1.5

Resolves: #2108456 - use latest criu
Resolves: #2101691 - enable likbrun support in rawhide

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
This commit is contained in:
Lokesh Mandvekar 2022-05-16 16:36:52 -04:00
parent d7722b9371
commit 80b16b4732
3 changed files with 31 additions and 5 deletions

1
.gitignore vendored
View File

@ -59,3 +59,4 @@ crun-0.1.1.tar.gz
/crun-1.4.3.tar.xz /crun-1.4.3.tar.xz
/crun-1.4.4.tar.xz /crun-1.4.4.tar.xz
/crun-1.4.5.tar.xz /crun-1.4.5.tar.xz
/crun-1.5.tar.xz

View File

@ -1,12 +1,20 @@
%global built_tag 1.4.5 %if 0%{?fedora} >= 37
%ifarch aarch64,x86_64
%global krun_support enabled
%endif
%else
%global krun_support disabled
%endif
%global built_tag 1.5
Summary: OCI runtime written in C Summary: OCI runtime written in C
Name: crun Name: crun
Version: 1.4.5 Version: 1.5
URL: https://github.com/containers/%{name} URL: https://github.com/containers/%{name}
Source0: %{url}/releases/download/%{version}/%{name}-%{version}.tar.xz Source0: %{url}/releases/download/%{version}/%{name}-%{version}.tar.xz
%if "%{_vendor}" == "debbuild" %if "%{_vendor}" == "debbuild"
Maintainer: Lokesh Mandvekar <https://github.com/lsm5> Packager: Lokesh Mandvekar <lsm5@fedoraproject.org>
License: GPL-2.0+ License: GPL-2.0+
Release: 0%{?dist} Release: 0%{?dist}
%else %else
@ -31,6 +39,10 @@ BuildRequires: python3
BuildRequires: libcap-devel BuildRequires: libcap-devel
BuildRequires: systemd-devel BuildRequires: systemd-devel
BuildRequires: yajl-devel BuildRequires: yajl-devel
%if "%{krun_support}" == "enabled"
BuildRequires: libkrun-devel
Provides: krun
%endif
BuildRequires: libseccomp-devel BuildRequires: libseccomp-devel
BuildRequires: libselinux-devel BuildRequires: libselinux-devel
BuildRequires: python3-libmount BuildRequires: python3-libmount
@ -38,9 +50,10 @@ BuildRequires: make
BuildRequires: glibc-static BuildRequires: glibc-static
BuildRequires: protobuf-c-devel BuildRequires: protobuf-c-devel
%ifnarch %ix86 %ifnarch %ix86
BuildRequires: criu-devel >= 3.15 BuildRequires: criu-devel >= 3.17.1-2
%endif %endif
%endif %endif
Requires: criu >= 3.17.1-2
Provides: oci-runtime Provides: oci-runtime
%description %description
@ -51,7 +64,12 @@ Provides: oci-runtime
%build %build
./autogen.sh ./autogen.sh
%if "%{krun_support}" == "enabled"
%configure --disable-silent-rules --with-libkrun
%else
%configure --disable-silent-rules %configure --disable-silent-rules
%endif
%make_build %make_build
@ -59,9 +77,16 @@ Provides: oci-runtime
%make_install %make_install
rm -rf %{buildroot}%{_prefix}/lib* rm -rf %{buildroot}%{_prefix}/lib*
%if "%{krun_support}" == "enabled"
ln -s %{_bindir}/%{name} %{buildroot}%{_bindir}/krun
%endif
%files %files
%license COPYING %license COPYING
%{_bindir}/%{name} %{_bindir}/%{name}
%if "%{krun_support}" == "enabled"
%{_bindir}/krun
%endif
%{_mandir}/man1/* %{_mandir}/man1/*
%changelog %changelog

View File

@ -1 +1 @@
SHA512 (crun-1.4.5.tar.xz) = 9f288279615fdf587018c465047fc8793daae280ab864bf9046994983239129d50f2eb89cac9b092e5cdc49a10f3523ab403a3f0e7451f7536b79f651a355153 SHA512 (crun-1.5.tar.xz) = 8ae5c6e306878194842f3a6a40bfc07038f69b9bd693395d64251133acf59186ce79272a45a3aee26b2a9812cbedb7a37370aece582abb3119ab7cdf7183e57b