From 87bb39e735a468afeb06b846aba4a0cb2609811acccb0b940b3ca3dacbe8d78b Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@suse.com>
Date: Mon, 13 Nov 2017 14:03:52 +0000
Subject: [PATCH] Accepting request 541011 from home:avindra

Now with the upstream information

OBS-URL: https://build.opensuse.org/request/show/541011
OBS-URL: https://build.opensuse.org/package/show/devel:tools/criu?expand=0&rev=76
---
 0001-images.py-remove-shebang.patch | 23 +++++++++++++++++++++++
 criu.changes                        |  9 +++++++++
 criu.spec                           | 23 +++++++++--------------
 3 files changed, 41 insertions(+), 14 deletions(-)
 create mode 100644 0001-images.py-remove-shebang.patch

diff --git a/0001-images.py-remove-shebang.patch b/0001-images.py-remove-shebang.patch
new file mode 100644
index 0000000..ff2ec57
--- /dev/null
+++ b/0001-images.py-remove-shebang.patch
@@ -0,0 +1,23 @@
+From aee84030f4623c468faaa90b8fc0820e39f86bda Mon Sep 17 00:00:00 2001
+From: Avindra Goolcharan <aavindraa@gmail.com>
+Date: Sat, 4 Nov 2017 18:46:03 -0400
+Subject: [PATCH] images.py: remove shebang
+
+This file is not executable directly, so it should not have the shebang.
+---
+ lib/py/images/images.py | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/lib/py/images/images.py b/lib/py/images/images.py
+index bb2f383..b706fd3 100644
+--- a/lib/py/images/images.py
++++ b/lib/py/images/images.py
+@@ -1,5 +1,3 @@
+-#!/bin/env python2
+-
+ # This file contains methods to deal with criu images.
+ #
+ # According to http://criu.org/Images, criu images can be described
+-- 
+2.15.0
+Signed-off-by: Avindra Goolcharan <aavindraa@gmail.com>
diff --git a/criu.changes b/criu.changes
index 9c14008..7592001 100644
--- a/criu.changes
+++ b/criu.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Sun Nov 12 01:05:43 UTC 2017 - aavindraa@gmail.com
+
+- add 0001-images.py-remove-shebang.patch
+  * fixes a lint warning about a non-executable python file being
+    executable due to a superfluous shebang
+  * upstream: https://lists.openvz.org/pipermail/criu/2017-November/039907.html
+- run spec-cleaner
+
 -------------------------------------------------------------------
 Sat Nov  4 22:41:24 UTC 2017 - aavindraa@gmail.com
 
diff --git a/criu.spec b/criu.spec
index b9944ef..554be95 100644
--- a/criu.spec
+++ b/criu.spec
@@ -25,21 +25,22 @@ Group:          System/Console
 Url:            http://criu.org/
 Source0:        http://download.openvz.org/criu/%{name}-%{version}.tar.bz2
 Patch1:         criu-py-install-fix.diff
+# PATCH-FIX-UPSTREAM 0001-images.py-remove-shebang.patch https://lists.openvz.org/pipermail/criu/2017-November/039907.html
+Patch2:         0001-images.py-remove-shebang.patch
 BuildRequires:  asciidoc
-%if 0%{suse_version} > 1320
-BuildRequires:  libbsd-devel
-%endif
 BuildRequires:  libcap-devel
 BuildRequires:  libnet-devel
 BuildRequires:  libnl3-devel
-BuildRequires:  pkg-config
+BuildRequires:  pkgconfig
 BuildRequires:  protobuf-c
 BuildRequires:  protobuf-devel
 BuildRequires:  xmlto
 Requires:       python-ipaddr
 Requires:       python-protobuf
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 ExclusiveArch:  x86_64 aarch64 ppc64le %{arm} s390x
+%if 0%{?suse_version} > 1320
+BuildRequires:  libbsd-devel
+%endif
 
 %description
 Checkpoint/Restore In Userspace, or CRIU, is a software tool for Linux
@@ -80,6 +81,7 @@ to develop applications with CRIU library.
 %prep
 %setup -q
 %patch1 -p1
+%patch2 -p1
 # default off
 echo "BINFMT_MISC_VIRTUALIZED" > .config
 
@@ -101,34 +103,27 @@ ln -s criu %{buildroot}%{_sbindir}/crtools
 ln -s criu.8 %{buildroot}%{_mandir}/man8/crtools.8
 
 %post -n libcriu1 -p /sbin/ldconfig
-
 %postun -n libcriu1 -p /sbin/ldconfig
-
 %post -n libcompel1 -p /sbin/ldconfig
-
 %postun -n libcompel1 -p /sbin/ldconfig
 
 %files
-%defattr(-,root,root)
 %doc README.md COPYING
 %{_sbindir}/*
 %{_bindir}/*
 %{_mandir}/man*/*
 %{_libexecdir}/criu
 %{_libexecdir}/compel
-/usr/lib/python*/site-packages/crit-*.egg-info
-/usr/lib/python*/site-packages/pycriu
+%{_prefix}/lib/python*/site-packages/crit-*.egg-info
+%{_prefix}/lib/python*/site-packages/pycriu
 
 %files -n libcriu1
-%defattr(-,root,root)
 %{_libdir}/libcriu.so.*
 
 %files -n libcompel1
-%defattr(-,root,root)
 %{_libdir}/libcompel.so.*
 
 %files devel
-%defattr(-,root,root)
 %{_includedir}/criu
 %{_includedir}/compel
 %{_libdir}/libcriu.so