Update to 3.17
* Drop upstreamed patches * Remove compel man-page Resolves: rhbz#2033446 Signed-off-by: Adrian Reber <areber@redhat.com>
This commit is contained in:
parent
f657401759
commit
f139c55e98
25
criu.spec
25
criu.spec
@ -6,14 +6,14 @@
|
|||||||
%global _lto_cflags %%{nil}
|
%global _lto_cflags %%{nil}
|
||||||
|
|
||||||
Name: criu
|
Name: criu
|
||||||
Version: 3.15
|
Version: 3.17
|
||||||
Release: 13%{?dist}
|
Release: 1%{?dist}
|
||||||
Provides: crtools = %{version}-%{release}
|
Provides: crtools = %{version}-%{release}
|
||||||
Obsoletes: crtools <= 1.0-2
|
Obsoletes: crtools <= 1.0-2
|
||||||
Summary: Tool for Checkpoint/Restore in User-space
|
Summary: Tool for Checkpoint/Restore in User-space
|
||||||
License: GPLv2
|
License: GPLv2
|
||||||
URL: http://criu.org/
|
URL: http://criu.org/
|
||||||
Source0: http://download.openvz.org/criu/criu-%{version}.tar.bz2
|
Source0: https://github.com/checkpoint-restore/criu/archive/v%{version}/criu-%{version}.tar.gz
|
||||||
Source1: criu-tmpfiles.conf
|
Source1: criu-tmpfiles.conf
|
||||||
BuildRequires: gcc
|
BuildRequires: gcc
|
||||||
BuildRequires: systemd
|
BuildRequires: systemd
|
||||||
@ -27,9 +27,6 @@ BuildRequires: make
|
|||||||
# Checkpointing containers with a tmpfs requires tar
|
# Checkpointing containers with a tmpfs requires tar
|
||||||
Recommends: tar
|
Recommends: tar
|
||||||
|
|
||||||
Patch0: 0001-util-make-page-server-IPv6-safe.patch
|
|
||||||
Patch1: 0001-Fix-building-with-annobin.patch
|
|
||||||
|
|
||||||
# user-space and kernel changes are only available for x86_64, arm,
|
# user-space and kernel changes are only available for x86_64, arm,
|
||||||
# ppc64le, aarch64 and s390x
|
# ppc64le, aarch64 and s390x
|
||||||
# https://bugzilla.redhat.com/show_bug.cgi?id=902875
|
# https://bugzilla.redhat.com/show_bug.cgi?id=902875
|
||||||
@ -43,6 +40,7 @@ Linux in user-space.
|
|||||||
%package devel
|
%package devel
|
||||||
Summary: Header files and libraries for %{name}
|
Summary: Header files and libraries for %{name}
|
||||||
Requires: %{name} = %{version}-%{release}
|
Requires: %{name} = %{version}-%{release}
|
||||||
|
Requires: %{name}-libs = %{version}-%{release}
|
||||||
|
|
||||||
%description devel
|
%description devel
|
||||||
This package contains header files and libraries for %{name}.
|
This package contains header files and libraries for %{name}.
|
||||||
@ -73,8 +71,6 @@ their content in human-readable form.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
%patch0 -p1
|
|
||||||
%patch1 -p1
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
# %{?_smp_mflags} does not work
|
# %{?_smp_mflags} does not work
|
||||||
@ -93,11 +89,17 @@ install -d -m 0755 %{buildroot}/run/%{name}/
|
|||||||
# remove static libs
|
# remove static libs
|
||||||
rm $RPM_BUILD_ROOT%{_libdir}/*.a
|
rm $RPM_BUILD_ROOT%{_libdir}/*.a
|
||||||
rm -rf $RPM_BUILD_ROOT%{_libexecdir}/%{name}
|
rm -rf $RPM_BUILD_ROOT%{_libexecdir}/%{name}
|
||||||
|
# remove compel man-page
|
||||||
|
rm $RPM_BUILD_ROOT%{_mandir}/man1/compel.1*
|
||||||
|
# remove amdgpu plugin man-page
|
||||||
|
rm $RPM_BUILD_ROOT%{_mandir}/man1/amdgpu_plugin.1*
|
||||||
|
# remove criu-ns
|
||||||
|
rm $RPM_BUILD_ROOT%{_sbindir}/criu-ns
|
||||||
|
rm $RPM_BUILD_ROOT%{_mandir}/man1/criu-ns.1*
|
||||||
|
|
||||||
%files
|
%files
|
||||||
%{_sbindir}/%{name}
|
%{_sbindir}/%{name}
|
||||||
%{_mandir}/man8/criu.8*
|
%{_mandir}/man8/criu.8*
|
||||||
%{_mandir}/man1/compel.1*
|
|
||||||
%dir /run/%{name}
|
%dir /run/%{name}
|
||||||
%{_tmpfilesdir}/%{name}.conf
|
%{_tmpfilesdir}/%{name}.conf
|
||||||
%doc README.md COPYING
|
%doc README.md COPYING
|
||||||
@ -119,6 +121,11 @@ rm -rf $RPM_BUILD_ROOT%{_libexecdir}/%{name}
|
|||||||
%doc %{_mandir}/man1/crit.1*
|
%doc %{_mandir}/man1/crit.1*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon May 09 2022 Adrian Reber <areber@redhat.com> - 3.17-1
|
||||||
|
- Update to 3.17
|
||||||
|
- Drop upstreamed patches
|
||||||
|
- Remove compel man-page
|
||||||
|
|
||||||
* Mon Jan 31 2022 Adrian Reber <areber@redhat.com> - 3.15-13
|
* Mon Jan 31 2022 Adrian Reber <areber@redhat.com> - 3.15-13
|
||||||
- Apply patch to build with annobin enabled
|
- Apply patch to build with annobin enabled
|
||||||
- Apply patch to fix unsafe IPv6 handling
|
- Apply patch to fix unsafe IPv6 handling
|
||||||
|
@ -1,3 +1,4 @@
|
|||||||
---
|
---
|
||||||
annocheck:
|
annocheck:
|
||||||
- rhel-policy: --verbose --skip-pie --skip-bind-now
|
jobs:
|
||||||
|
- hardened: --verbose --skip-pie --skip-bind-now --skip-stack-prot
|
||||||
|
2
sources
2
sources
@ -1 +1 @@
|
|||||||
SHA512 (criu-3.15.tar.bz2) = 7bfd32053e47b95d10cdd5e99494bff6a21aa3179518179f8c72e870f0aab960dd76c9f6cb6982e5b881472cf6962eefee3cf7d8ae9128b3379bcaecc937ebbc
|
SHA512 (criu-3.17.tar.gz) = febae66a7820345c0f335f4a49e64c0af5c8ae5d3a394cc0770881b64eab11ca03ad5872f06b0c4ccd1da844c519268dad3b4f8b260267e6d3f582e80d80f804
|
||||||
|
Loading…
Reference in New Issue
Block a user