avagin pushed to criu (f21). "Update to 1.5"

[notifications at fedoraproject.org]

>From 821cf3562afa9569e80f6d51c34002c36eb0cc6d Mon Sep 17 00:00:00 2001
From: Andrey Vagin <avagin at openvz.org>
Date: Wed, 4 Mar 2015 00:04:33 +0300
Subject: Update to 1.5


diff --git a/.gitignore b/.gitignore
index 225b47b..8e87a40 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@
 /criu-1.3.tar.bz2
 /criu-1.3.1.tar.bz2
 /criu-1.4.tar.bz2
+/criu-1.5.tar.bz2
diff --git a/criu.spec b/criu.spec
index 0ca5981..3e4dcda 100644
--- a/criu.spec
+++ b/criu.spec
@@ -1,5 +1,5 @@
 Name: criu	
-Version: 1.4
+Version: 1.5
 Release: 1%{?dist}
 Provides: crtools = %{version}-%{release}
 Obsoletes: crtools <= 1.0-2
@@ -8,8 +8,9 @@ Group: System Environment/Base
 License: GPLv2
 URL: http://criu.org/
 Source0: http://download.openvz.org/criu/criu-%{version}.tar.bz2
+Patch1: python.patch
 
-BuildRequires: protobuf-c-devel asciidoc xmlto
+BuildRequires: protobuf-devel protobuf-c-devel asciidoc xmlto python2-devel
 
 # user-space and kernel changes are only available for x86_64 and ARM
 # code is very architecture specific
@@ -33,6 +34,7 @@ This package contains header files and libraries for %{name}.
 
 %prep
 %setup -q -n criu-%{version}
+%patch1 -p1
 
 %build
 # %{?_smp_mflags} does not work
@@ -54,11 +56,14 @@ ln -s %{_sbindir}/criu $RPM_BUILD_ROOT%{_sbindir}/crtools
 %files
 %{_sbindir}/%{name}
 %{_sbindir}/crtools
+%{_bindir}/crit
 %{_mandir}/man8/*
 %{_unitdir}/criu.service
 %{_unitdir}/criu.socket
 %{_libdir}/*.so.*
 %{_sysconfdir}/logrotate.d/%{name}-service
+%{python2_sitelib}/pycriu/*
+%{python2_sitelib}/*egg-info
 %doc README COPYING
 
 %files devel
diff --git a/python.patch b/python.patch
new file mode 100644
index 0000000..d778c1a
--- /dev/null
+++ b/python.patch
@@ -0,0 +1,13 @@
+diff --git a/Makefile b/Makefile
+index a896e33..ee42d84 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)
+ 
+ .PHONY: install install-man install-crit
+ 
diff --git a/sources b/sources
index cd799f1..01eec4b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-35c3904abcf297bd88b8f7bcd2a588d5  criu-1.4.tar.bz2
+33508f18d23676456ed99f201bdaa6bc  criu-1.5.tar.bz2
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/criu.git/commit/?h=f21&id=821cf3562afa9569e80f6d51c34002c36eb0cc6d