diff --git a/criu.spec b/criu.spec index 0ccf51c..9e1afbc 100644 --- a/criu.spec +++ b/criu.spec @@ -1,7 +1,8 @@ %global py_prefix python3 %global py_binary %{py_prefix} -# https://bugzilla.redhat.com/show_bug.cgi?id=1904567 +# This package calls LD directly without specifying the LTO plugins. Until +# that is fixed, disable LTO. %global _lto_cflags %%{nil} # With annobin enabled, CRIU does not work anymore. It seems CRIU's @@ -10,7 +11,7 @@ Name: criu Version: 3.15 -Release: 10%{?dist} +Release: 11%{?dist} Provides: crtools = %{version}-%{release} Obsoletes: crtools <= 1.0-2 Summary: Tool for Checkpoint/Restore in User-space @@ -26,7 +27,6 @@ BuildRequires: asciidoc xmlto BuildRequires: perl-interpreter BuildRequires: libselinux-devel BuildRequires: gnutls-devel -BuildRequires: nftables-devel BuildRequires: make # Checkpointing containers with a tmpfs requires tar Recommends: tar @@ -44,7 +44,6 @@ Linux in user-space. %package devel Summary: Header files and libraries for %{name} Requires: %{name} = %{version}-%{release} -Requires: criu-libs = %{version}-%{release} %description devel This package contains header files and libraries for %{name}. @@ -119,6 +118,11 @@ rm -rf $RPM_BUILD_ROOT%{_libexecdir}/%{name} %doc %{_mandir}/man1/crit.1* %changelog +* Tue Aug 31 2021 Adrian Reber - 3.15-11 +- Remove unnecessary Requires: criu-libs +- Remove wrong BR nftables-devel +- Bump release for rebuild + * Mon Aug 16 2021 Jindrich Novy - 3.15-10 - disable LTO on RHEL9 again - Related: #1970747 diff --git a/tests/run-podman-checkpoint-restore.sh b/tests/run-podman-checkpoint-restore.sh index 0fbcd2b..845d0b4 100755 --- a/tests/run-podman-checkpoint-restore.sh +++ b/tests/run-podman-checkpoint-restore.sh @@ -1,8 +1,5 @@ #!/bin/bash -# crun is not built with checkpoint/restore support -exit 0 - set -eux ls -la