- updated to 2.3

- updated python patch
- system service dropped upstream (running as root is discouraged)

diff --git a/criu-python.patch b/criu-python.patch
index fd3add32c70bc81868a8b443c6b285a4693be5ac..56ea2705a89b8e89fe2217fb8951a77a76251ef8 100644 (file)
--- a/criu-python.patch
+++ b/criu-python.patch
@@ -1,11 +1,11 @@
---- criu-1.7/Makefile.orig     2015-09-12 20:13:41.777088038 +0200
-+++ criu-1.7/Makefile  2015-09-12 20:54:17.423652491 +0200
-@@ -351,7 +351,7 @@
- 
- install-crit: crit
-       $(E) "  INSTALL crit"
--      $(Q) python scripts/crit-setup.py install --root=$(DESTDIR) --prefix=$(PREFIX)
-+      $(Q) python scripts/crit-setup.py install --root=$(DESTDIR) --prefix=$(PREFIX) --optimize=2
- 
- .PHONY: install install-man install-crit install-criu
+--- criu-2.3/lib/Makefile.orig 2016-06-14 10:41:17.000000000 +0200
++++ criu-2.3/lib/Makefile      2016-06-24 19:03:15.652060689 +0200
+@@ -56,7 +56,7 @@
+       $(Q) sed -e 's,@version@,$(CRIU_VERSION),' -e 's,@libdir@,$(LIBDIR),' -e 's,@includedir@,$(dir $(INCLUDEDIR)),' c/criu.pc.in > c/criu.pc
+       $(Q) install -m 644 c/criu.pc $(DESTDIR)$(LIBDIR)/pkgconfig
+       $(E) "  INSTALL " crit
+-      $(Q) python ../scripts/crit-setup.py install --root=$(DESTDIR) --prefix=$(PREFIX) --record $(CRIT_SETUP_FILES)
++      $(Q) python ../scripts/crit-setup.py install --root=$(DESTDIR) --prefix=$(PREFIX) --install-purelib=$(PYSITESCRIPTDIR) --optimize=2 --record $(CRIT_SETUP_FILES)
+ .PHONY: install
  
+ uninstall:

diff --git a/criu.spec b/criu.spec
index a2934bd5fc6b44d7fc10608ea2e97425fddbeb24..3b39d653ffc88fb7e47d7480e4d4815b7081e741 100644 (file)
--- a/criu.spec
+++ b/criu.spec
@@ -1,25 +1,24 @@
 Summary:       Checkpoint/restore functionality for Linux in userspace
 Summary(pl.UTF-8):     Funkcja checkpoint/restore w przestrzeni użytkownika dla Linuksa
 Name:          criu
-Version:       1.7
-Release:       3
+Version:       2.3
+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: 317a2c303f445824c640d5665a40d778
+# Source0-md5: ba8f3ba9aed1219f0569cc2958a4f171
 Patch0:                %{name}-python.patch
 URL:           http://criu.org/
 BuildRequires: autoconf >= 2.50
+BuildRequires: libnl-devel >= 3.2
 BuildRequires: protobuf-c-devel
 BuildRequires: python >= 2
 BuildRequires: rpmbuild(macros) >= 1.228
 BuildRequires: sed >= 4.0
-Requires(post,preun,postun):   systemd-units >= 38
 Requires:      %{name}-libs = %{version}-%{release}
 Requires:      iproute2 >= 3.6
 Requires:      uname(release) >= 3.9
-Requires:      systemd-units >= 38
-ExclusiveArch: %{x8664}
+ExclusiveArch: %{x8664} arm aarch64 ppc64
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -89,7 +88,7 @@ Pythonowy interfejs do CRIU. Ten pakiet zawiera także narzędzie crit.
 %setup -q
 %patch0 -p1
 
-sed -i -e 's#-O2#$(OPT)#g' Makefile*
+%{__sed} -i -e 's#-O2 -g#$(OPT)#g' Makefile
 
 %build
 %{__make} \
@@ -97,8 +96,8 @@ sed -i -e 's#-O2#$(OPT)#g' Makefile*
        CC="%{__cc}" \
        OPT="%{rpmcppflags} %{rpmcflags}" \
        PREFIX=%{_prefix} \
+       LIBDIR=%{_libdir} \
        LOGROTATEDIR=%{_sysconfdir}/logrotate.d \
-       SYSTEMDUNITDIR=%{systemdunitdir} \
        V=1 \
        WERROR=0
 
@@ -106,9 +105,10 @@ sed -i -e 's#-O2#$(OPT)#g' Makefile*
 rm -rf $RPM_BUILD_ROOT
 %{__make} install \
        DEB_HOST_MULTIARCH= \
-       PREFIX="%{_prefix}" \
+       PREFIX=%{_prefix} \
+       LIBDIR=%{_libdir} \
+       PYSITESCRIPTDIR=%{py_sitescriptdir} \
        LOGROTATEDIR=%{_sysconfdir}/logrotate.d \
-       SYSTEMDUNITDIR=%{systemdunitdir} \
        MANDIR=%{_mandir} \
        DESTDIR=$RPM_BUILD_ROOT
 
@@ -117,15 +117,6 @@ rm -rf $RPM_BUILD_ROOT
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post
-%systemd_post criu.service
-
-%preun
-%systemd_preun criu.service
-
-%postun
-%systemd_reload
-
 %post   libs -p /sbin/ldconfig
 %postun libs -p /sbin/ldconfig
 
@@ -134,9 +125,6 @@ rm -rf $RPM_BUILD_ROOT
 %doc CREDITS README.md
 %attr(755,root,root) %{_sbindir}/criu
 %{_mandir}/man8/criu.8*
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/criu-service
-%{systemdunitdir}/criu.service
-%{systemdunitdir}/criu.socket
 
 %files libs
 %defattr(644,root,root,755)