From b3108b9cc8261a470fb9e128dd8694dd57ca4684 Mon Sep 17 00:00:00 2001
From: Adrian Reber <adrian@lisas.de>
Date: Apr 11 2016 13:54:04 +0000
Subject: Update to 2.1


---

diff --git a/.gitignore b/.gitignore
index c6a6fff..f6df44b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,4 @@
 /criu-1.7.2.tar.bz2
 /criu-1.8.tar.bz2
 /criu-2.0.tar.bz2
+/criu-2.1.tar.bz2
diff --git a/0001-log-Include-inttypes.h-for-PRI-helpers.patch b/0001-log-Include-inttypes.h-for-PRI-helpers.patch
deleted file mode 100644
index 025b3b5..0000000
--- a/0001-log-Include-inttypes.h-for-PRI-helpers.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 0c89d779f93ea95398dfbcda079eb3ad2424c0ca Mon Sep 17 00:00:00 2001
-From: Cyrill Gorcunov <gorcunov@openvz.org>
-Date: Thu, 24 Apr 2014 22:57:57 +0400
-Subject: [PATCH] log: Include inttypes.h for PRI helpers
-
-https://bugzilla.openvz.org/show_bug.cgi?id=2949
-
-Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org>
-Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
-Signed-off-by: Andrey Vagin <avagin@openvz.org>
----
- include/log.h | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/include/log.h b/include/log.h
-index 9948098..65a65ac 100644
---- a/include/log.h
-+++ b/include/log.h
-@@ -1,6 +1,8 @@
- #ifndef __CR_LOG_H__
- #define __CR_LOG_H__
- 
-+#include <inttypes.h>
-+
- #include "criu-log.h"
- 
- extern int log_init(const char *output);
--- 
-1.9.3
-
diff --git a/criu.spec b/criu.spec
index 5a4cad6..6dea9bc 100644
--- a/criu.spec
+++ b/criu.spec
@@ -1,5 +1,5 @@
 Name: criu
-Version: 2.0
+Version: 2.1
 Release: 1%{?dist}
 Provides: crtools = %{version}-%{release}
 Obsoletes: crtools <= 1.0-2
@@ -18,13 +18,19 @@ BuildRequires: asciidoc xmlto
 # code is very architecture specific
 # once imported in RCS it needs a bug openend explaining the ExclusiveArch
 # https://bugzilla.redhat.com/show_bug.cgi?id=902875
+%if 0%{?fedora}
 ExclusiveArch: x86_64 %{arm} ppc64le aarch64
+%else
+ExclusiveArch: x86_64 ppc64le
+%endif
+
 
 %description
 criu is the user-space part of Checkpoint/Restore in User-space
 (CRIU), a project to implement checkpoint/restore functionality for
 Linux in user-space.
 
+%if 0%{?fedora}
 %package devel
 Summary: Header files and libraries for %{name}
 Group: Development/Libraries
@@ -32,6 +38,7 @@ Requires: %{name} = %{version}-%{release}
 
 %description devel
 This package contains header files and libraries for %{name}.
+%endif
 
 %package -n python-%{name}
 Summary: Python bindings for %{name}
@@ -71,6 +78,13 @@ make install-lib DESTDIR=$RPM_BUILD_ROOT PREFIX=%{_prefix} LIBDIR=%{_libdir}
 make install-man DESTDIR=$RPM_BUILD_ROOT PREFIX=%{_prefix} LIBDIR=%{_libdir}
 %endif
 
+%if 0%{?rhel}
+# remove devel package
+rm -rf $RPM_BUILD_ROOT%{_includedir}/criu
+rm $RPM_BUILD_ROOT%{_libdir}/*.so*
+rm -rf $RPM_BUILD_ROOT%{_libdir}/pkgconfig
+%endif
+
 %if 0%{?fedora}
 # upstream renamed to binary to criu
 ln -s %{_sbindir}/criu $RPM_BUILD_ROOT%{_sbindir}/crtools
@@ -84,14 +98,16 @@ ln -s %{_sbindir}/criu $RPM_BUILD_ROOT%{_sbindir}/crtools
 %if 0%{?fedora}
 %{_sbindir}/crtools
 %doc %{_mandir}/man8/criu.8*
-%endif
 %{_libdir}/*.so.*
+%endif
 %doc README.md COPYING
 
+%if 0%{?fedora}
 %files devel
 %{_includedir}/criu
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*.pc
+%endif
 
 %files -n python-%{name}
 %{python2_sitelib}/pycriu/*
@@ -102,6 +118,12 @@ ln -s %{_sbindir}/criu $RPM_BUILD_ROOT%{_sbindir}/crtools
 
 
 %changelog
+* Mon Apr 11 2016 Adrian Reber <adrian@lisas.de> - 2.1-1
+- Update to 2.1
+
+* Wed Apr 06 2016 Adrian Reber <areber@redhat.com> - 2.0-2
+- Merge changes from Fedora
+
 * Thu Mar 10 2016 Andrey Vagin <avagin@openvz.org> - 2.0-1
 - Update to 2.0
 
diff --git a/sources b/sources
index 392c721..b8784e4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-12c453489dd1729505211eb034c6e441  criu-2.0.tar.bz2
+f075b3daa3560e2c0381c75bd62de35a  criu-2.1.tar.bz2