From 9b903f6a012c4c04014f509967a0d98c74da34fd Mon Sep 17 00:00:00 2001
From: Adrian Reber <adrian@lisas.de>
Date: Sun, 27 Aug 2017 21:10:56 +0200
Subject: [PATCH] Update to 3.4 (#1483774) Removed upstreamed patches Added
 s390x (#1475719)

---
 .gitignore |  1 +
 criu.spec  | 39 ++++++++++++++++++++++-----------------
 sources    |  2 +-
 3 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/.gitignore b/.gitignore
index 531d9d3..e36cac5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,3 +36,4 @@
 /criu-3.1.tar.bz2
 /criu-3.2.1.tar.bz2
 /criu-3.3.tar.bz2
+/criu-3.4.tar.bz2
diff --git a/criu.spec b/criu.spec
index ca249e2..aa1d236 100644
--- a/criu.spec
+++ b/criu.spec
@@ -1,6 +1,12 @@
+%if 0%{?fedora} > 27
+%global py2_prefix python2
+%else
+%global py2_prefix python
+%endif
+
 Name: criu
-Version: 3.3
-Release: 5%{?dist}
+Version: 3.4
+Release: 1%{?dist}
 Provides: crtools = %{version}-%{release}
 Obsoletes: crtools <= 1.0-2
 Summary: Tool for Checkpoint/Restore in User-space
@@ -9,10 +15,6 @@ License: GPLv2
 URL: http://criu.org/
 Source0: http://download.openvz.org/criu/criu-%{version}.tar.bz2
 
-# Patches are submitted upstream
-Patch0: 0001-compel-aarch64-glibc-renamed-ucontext-to-ucontext_t.patch
-Patch1: 0003-compel-ppc64-glibc-renamed-ucontext-to-ucontext_t.patch
-
 %if 0%{?rhel}
 # RHEL has no asciidoc; take man-page from Fedora 24
 # zcat /usr/share/man/man8/criu.8.gz > criu.8
@@ -30,12 +32,12 @@ BuildRequires: perl-interpreter
 BuildRequires: asciidoc xmlto
 %endif
 
-# user-space and kernel changes are only available for x86_64 and ARM
-# code is very architecture specific
-# once imported in RCS it needs a bug openend explaining the ExclusiveArch
+# user-space and kernel changes are only available for x86_64, arm,
+# ppc64le, aarch64 and s390x
+# the code is very architecture specific
 # https://bugzilla.redhat.com/show_bug.cgi?id=902875
 %if 0%{?fedora}
-ExclusiveArch: x86_64 %{arm} ppc64le aarch64
+ExclusiveArch: x86_64 %{arm} ppc64le aarch64 s390x
 %else
 ExclusiveArch: x86_64 ppc64le
 %endif
@@ -56,18 +58,18 @@ Requires: %{name} = %{version}-%{release}
 This package contains header files and libraries for %{name}.
 %endif
 
-%package -n python2-%{name}
-%{?python_provide:%python_provide python2-%{name}}
+%package -n %{py2_prefix}-%{name}
+%{?python_provide:%python_provide %{py2_prefix}-%{name}}
 Summary: Python bindings for %{name}
 Group: Development/Languages
 Requires: %{name} = %{version}-%{release} python-ipaddr protobuf-python
 
-%description -n python2-%{name}
+%description -n %{py2_prefix}-%{name}
 python-%{name} contains Python bindings for %{name}.
 
 %package -n crit
 Summary: CRIU image tool
-Requires: python-%{name} = %{version}-%{release}
+Requires: %{py2_prefix}-%{name} = %{version}-%{release}
 
 %description -n crit
 crit is a tool designed to decode CRIU binary dump files and show
@@ -76,8 +78,6 @@ their content in human-readable form.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
 
 %build
 # %{?_smp_mflags} does not work
@@ -132,7 +132,7 @@ rm -rf $RPM_BUILD_ROOT%{_libdir}/pkgconfig
 %{_libdir}/pkgconfig/*.pc
 %endif
 
-%files -n python2-%{name}
+%files -n %{py2_prefix}-%{name}
 %{python2_sitelib}/pycriu/*
 %{python2_sitelib}/*egg-info
 
@@ -142,6 +142,11 @@ rm -rf $RPM_BUILD_ROOT%{_libdir}/pkgconfig
 
 
 %changelog
+* Sun Aug 27 2017 Adrian Reber <adrian@lisas.de> - 3.4-1
+- Update to 3.4 (#1483774)
+- Removed upstreamed patches
+- Added s390x (#1475719)
+
 * Sat Aug 19 2017 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 3.3-5
 - Python 2 binary package renamed to python2-criu
   See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3
diff --git a/sources b/sources
index 589c773..8ae0cc0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (criu-3.3.tar.bz2) = 9354c8999597979e9f5cd8c249c5dc5225bd4691d093847545ede14bd3ecbeafe1bb08a677e2cece6f117c16873cf3a0a5fa4275cba6c0b668082b0f7e321123
+SHA512 (criu-3.4.tar.bz2) = 71fc700d19b46381873b2d0fa90e7fa253b00beb5e4e6065bbf510766acbcc14b35d58fa8073801112f897d2320b7decca1115fb6853d5fe64f3c52aa40a9f32