From 946dbbeb01b1d2b6a5a2418d561f98a969fd1dd75b01372357d4598683a02f69 Mon Sep 17 00:00:00 2001
From: Tomas Cech <sleep_walker@opensuse.org>
Date: Tue, 7 Apr 2015 14:04:40 +0000
Subject: [PATCH] Accepting request 294782 from home:tiwai

- Fix build failure on FACTORY due to comment-in-comment in
  google/protobuf/descriptor.proto
- update to version 1.5.1:
  * fix crash with 4.0 kernel
  * legalize swrk API and add the ability for inheriting fds via it
  * cgroup yard destruction and properties restore

OBS-URL: https://build.opensuse.org/request/show/294782
OBS-URL: https://build.opensuse.org/package/show/devel:tools/criu?expand=0&rev=21
---
 criu-1.5.1.tar.bz2 |  3 +++
 criu-1.5.tar.bz2   |  3 ---
 criu.changes       | 10 ++++++++++
 criu.spec          |  7 +++++--
 4 files changed, 18 insertions(+), 5 deletions(-)
 create mode 100644 criu-1.5.1.tar.bz2
 delete mode 100644 criu-1.5.tar.bz2

diff --git a/criu-1.5.1.tar.bz2 b/criu-1.5.1.tar.bz2
new file mode 100644
index 0000000..39b9d52
--- /dev/null
+++ b/criu-1.5.1.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0bf47f02e32ac7d81bb953ba6ecd0b8dd748728042afed36f31852a59042a8d2
+size 457316
diff --git a/criu-1.5.tar.bz2 b/criu-1.5.tar.bz2
deleted file mode 100644
index 5e95a30..0000000
--- a/criu-1.5.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c848918d5b67f68efd25224bc4a7ffe9252d039fc6f3cc77c6309f6427448cdf
-size 457323
diff --git a/criu.changes b/criu.changes
index c3fba34..398c69f 100644
--- a/criu.changes
+++ b/criu.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Tue Apr  7 15:52:47 CEST 2015 - tiwai@suse.de
+
+- Fix build failure on FACTORY due to comment-in-comment in
+  google/protobuf/descriptor.proto
+- update to version 1.5.1:
+  * fix crash with 4.0 kernel
+  * legalize swrk API and add the ability for inheriting fds via it
+  * cgroup yard destruction and properties restore
+
 -------------------------------------------------------------------
 Fri Mar 13 10:10:07 CET 2015 - tiwai@suse.de
 
diff --git a/criu.spec b/criu.spec
index 6b414a5..a7c3096 100644
--- a/criu.spec
+++ b/criu.spec
@@ -16,9 +16,9 @@
 #
 
 
-%define package_version 1.5
+%define package_version 1.5.1
 Name:           criu
-Version:        1.5
+Version:        1.5.1
 Release:        0
 Summary:        Checkpoint/Restore In Userspace Tools
 License:        GPL-2.0
@@ -66,6 +66,9 @@ to develop applications with CRIU library.
 %prep
 %setup -q -n %{name}-%{package_version}
 %patch1 -p1
+# fix up the broken protobuf descriptor.proto (comment-in-comment)
+rm -f protobuf/google/protobuf/descriptor.proto
+sed -e's@/\*@@g' -e's@\*/@@g' /usr/include/google/protobuf/descriptor.proto > protobuf/google/protobuf/descriptor.proto
 
 %build
 export CFLAGS="%{optflags}"