diff --git a/crit-install-prefix.diff b/crit-install-prefix.diff new file mode 100644 index 0000000..ba4e1ab --- /dev/null +++ b/crit-install-prefix.diff @@ -0,0 +1,13 @@ +diff --git a/Makefile b/Makefile +index 2a63f0477d08..d704a06446d5 100644 +--- a/Makefile ++++ b/Makefile +@@ -289,7 +289,7 @@ install-man: + + install-crit: crit + $(E) " INSTALL crit" +- $(Q) python scripts/crit-setup.py install --prefix=$(DESTDIR) ++ $(Q) python scripts/crit-setup.py install --root=$(DESTDIR) --prefix=$(PREFIX) + + .PHONY: install install-man install-crit + diff --git a/criu-1.4.tar.bz2 b/criu-1.4.tar.bz2 deleted file mode 100644 index c0d9902..0000000 --- a/criu-1.4.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:757347b3bfe824f93b9a5c98e60dfac5a73da978eb7ebd29d721dea496eaf789 -size 432735 diff --git a/criu-1.5.tar.bz2 b/criu-1.5.tar.bz2 new file mode 100644 index 0000000..5e95a30 --- /dev/null +++ b/criu-1.5.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c848918d5b67f68efd25224bc4a7ffe9252d039fc6f3cc77c6309f6427448cdf +size 457323 diff --git a/criu.changes b/criu.changes index 3f78e08..c3fba34 100644 --- a/criu.changes +++ b/criu.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Fri Mar 13 10:10:07 CET 2015 - tiwai@suse.de + +- update to version 1.5: New features + * CRIT tool + * ability to request CPU compatibility on instructions level only + * C/R of empty AIO rings + * more detailed errno report via RPC + * per-feature "criu check" + * inheriting FDs on restore + * ability to automatically move veth device to host-side bridge + on netns restore + * VT terminals support + * more user namespaces C/R stuff + See more details at http://criu.org/Releases#v._1.5 +- fix installation of crit: + crit-install-prefix.diff + ------------------------------------------------------------------- Mon Dec 1 18:17:51 CET 2014 - tiwai@suse.de diff --git a/criu.spec b/criu.spec index cfc4cb1..6b414a5 100644 --- a/criu.spec +++ b/criu.spec @@ -1,7 +1,7 @@ # # spec file for package criu # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,18 +16,20 @@ # -%define package_version 1.4 +%define package_version 1.5 Name: criu -Version: 1.4 +Version: 1.5 Release: 0 Summary: Checkpoint/Restore In Userspace Tools License: GPL-2.0 Group: System/Console Url: http://criu.org/ Source0: http://download.openvz.org/criu/criu-%{package_version}.tar.bz2 +Patch1: crit-install-prefix.diff BuildRequires: asciidoc BuildRequires: pkg-config BuildRequires: protobuf-c +BuildRequires: protobuf-devel BuildRequires: xmlto BuildRequires: pkgconfig(systemd) Requires: logrotate @@ -63,6 +65,7 @@ to develop applications with CRIU library. %prep %setup -q -n %{name}-%{package_version} +%patch1 -p1 %build export CFLAGS="%{optflags}" @@ -103,9 +106,12 @@ exit 0 %defattr(-,root,root) %doc README COPYING %{_sbindir}/* +%{_bindir}/* %{_mandir}/man*/* %{_unitdir}/criu.* %config %{_sysconfdir}/logrotate.d/* +/usr/lib/python*/site-packages/crit-*.egg-info +/usr/lib/python*/site-packages/pycriu %files -n libcriu1 %defattr(-,root,root)