up to 2.4

diff --git a/cc-quote.patch b/cc-quote.patch
new file mode 100644 (file)
index 0000000..fc45d39
--- /dev/null
+++ b/cc-quote.patch
@@ -0,0 +1,11 @@
+--- criu-2.4/criu/Makefile~    2016-08-21 10:55:35.000000000 +0300
++++ criu-2.4/criu/Makefile     2016-08-21 10:55:36.728867281 +0300
+@@ -48,7 +48,7 @@
+         ifneq ($(shell sh -c                                                            \
+                         'TMP="$(OUTPUT)$(TMPOUT).$$$$";                                 \
+                         echo "int main(int argc, char *argv[]) { return 0; }" |         \
+-                        "$(CC)" -x c - $(LIBS) -o "$$TMP" > /dev/null 2>&1 && echo y;   \
++                        $(CC) -x c - $(LIBS) -o "$$TMP" > /dev/null 2>&1 && echo y;   \
+                         rm -f "$$TMP"'),y)
+                 $(warning "Couldn't find some of the required libraries")
+                 $(warning "Make sure the following packages are installed")

diff --git a/criu.spec b/criu.spec
index 02ecd111b05ee31a5c902f677b9b1f3255ec3ab9..3c3f254395f68dc5a05b9ada31520cb8fd1dca5a 100644 (file)
--- a/criu.spec
+++ b/criu.spec
@@ -1,13 +1,16 @@
+# TODO
+# - unpackaged: /usr/libexec/criu/scripts/systemd-autofs-restart.sh

 Summary:       Checkpoint/restore functionality for Linux in userspace
 Summary(pl.UTF-8):     Funkcja checkpoint/restore w przestrzeni użytkownika dla Linuksa
 Name:          criu
 Summary:       Checkpoint/restore functionality for Linux in userspace
 Summary(pl.UTF-8):     Funkcja checkpoint/restore w przestrzeni użytkownika dla Linuksa
 Name:          criu

-Version:       2.3
+Version:       2.4

 Release:       1
 License:       GPL v2 (tools), LGPL v2.1 (library)
 Group:         Applications/System
 Source0:       http://download.openvz.org/criu/%{name}-%{version}.tar.bz2
 Release:       1
 License:       GPL v2 (tools), LGPL v2.1 (library)
 Group:         Applications/System
 Source0:       http://download.openvz.org/criu/%{name}-%{version}.tar.bz2

-# Source0-md5: ba8f3ba9aed1219f0569cc2958a4f171
+# Source0-md5: 2f3a158d9bf74529c9dad53a67514de7

 Patch0:                %{name}-python.patch
 Patch0:                %{name}-python.patch

+Patch1:                cc-quote.patch

 URL:           http://criu.org/
 BuildRequires: asciidoc
 BuildRequires: libcap-devel
 URL:           http://criu.org/
 BuildRequires: asciidoc
 BuildRequires: libcap-devel


@@ -93,6 +96,7 @@ Pythonowy interfejs do CRIU. Ten pakiet zawiera także narzędzie crit.
 %prep
 %setup -q
 %patch0 -p1
 %prep
 %setup -q
 %patch0 -p1

+%patch1 -p1

 
 %{__sed} -i -e 's#-O2 -g#$(OPT)#g' Makefile
 
 
 %{__sed} -i -e 's#-O2 -g#$(OPT)#g' Makefile