up to 3.14

diff --git a/criu-python.patch b/criu-python.patch
index 56ea2705a89b8e89fe2217fb8951a77a76251ef8..11f69851ca3bf32765eee3f9646f5f2f984a3919 100644 (file)
--- a/criu-python.patch
+++ b/criu-python.patch
@@ -4,8 +4,8 @@
        $(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) 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)
+-      $(Q) $(PYTHON) scripts/crit-setup.py install --prefix=$(DESTDIR)$(PREFIX) --record $(CRIT_SETUP_FILES)
++      $(Q) $(PYTHON) scripts/crit-setup.py install --prefix=$(DESTDIR)$(PREFIX) --install-purelib=$(DESTDIR)$(PYSITESCRIPTDIR) --optimize=2 --record $(CRIT_SETUP_FILES)

  .PHONY: install
  
  uninstall:
  .PHONY: install
  
  uninstall:

diff --git a/criu.spec b/criu.spec
index 987cc781825cbf7acc0b46861f9b7dac413f1f8b..3ab42a5a209bdee399e10caa627463fc58b6f8fd 100644 (file)
--- a/criu.spec
+++ b/criu.spec
@@ -1,3 +1,10 @@
+# TODO
+# - package static libs
+#      /usr/lib/compel/fds.lib.a
+#      /usr/lib/compel/scripts/compel-pack.lds.S
+#      /usr/lib/compel/std.lib.a
+#      /usr/lib64/libcompel.a
+#      /usr/lib64/libcriu.a

 #
 # Conditional build:
 %bcond_with    tests           # build and run tests (requires root)
 #
 # Conditional build:
 %bcond_with    tests           # build and run tests (requires root)


@@ -5,17 +12,18 @@
 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.5
+Version:       3.14

 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: 5d5115454d110adb744e885d82d2c1f6
+# Source0-md5: 73398c3db4b3535393b04546a4cc5bc9

 Patch0:                %{name}-python.patch
 Patch1:                tests.patch
 URL:           http://criu.org/
 BuildRequires: asciidoc
 BuildRequires: libcap-devel
 Patch0:                %{name}-python.patch
 Patch1:                tests.patch
 URL:           http://criu.org/
 BuildRequires: asciidoc
 BuildRequires: libcap-devel

+BuildRequires: libnet-devel

 BuildRequires: libnl-devel >= 1:3.2
 BuildRequires: pkgconfig
 BuildRequires: protobuf
 BuildRequires: libnl-devel >= 1:3.2
 BuildRequires: pkgconfig
 BuildRequires: protobuf


@@ -144,7 +152,10 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc CREDITS README.md
 %files
 %defattr(644,root,root,755)
 %doc CREDITS README.md

+%attr(755,root,root) %{_bindir}/compel

 %attr(755,root,root) %{_sbindir}/criu
 %attr(755,root,root) %{_sbindir}/criu

+%{_mandir}/man1/compel.1*
+%{_mandir}/man1/crit.1*

 %{_mandir}/man8/criu.8*
 %dir %{_libexecdir}/%{name}
 %dir %{_libexecdir}/%{name}/scripts
 %{_mandir}/man8/criu.8*
 %dir %{_libexecdir}/%{name}
 %dir %{_libexecdir}/%{name}/scripts


@@ -153,12 +164,16 @@ rm -rf $RPM_BUILD_ROOT
 
 %files libs
 %defattr(644,root,root,755)
 
 %files libs
 %defattr(644,root,root,755)

+%attr(755,root,root) %{_libdir}/libcompel.so.*.*
+%attr(755,root,root) %ghost %{_libdir}/libcompel.so.1

 %attr(755,root,root) %{_libdir}/libcriu.so.*.*
 %attr(755,root,root) %{_libdir}/libcriu.so.*.*

-%attr(755,root,root) %ghost %{_libdir}/libcriu.so.1
+%attr(755,root,root) %ghost %{_libdir}/libcriu.so.2

 
 %files devel
 %defattr(644,root,root,755)
 
 %files devel
 %defattr(644,root,root,755)

+%attr(755,root,root) %{_libdir}/libcompel.so

 %attr(755,root,root) %{_libdir}/libcriu.so
 %attr(755,root,root) %{_libdir}/libcriu.so

+%{_includedir}/compel

 %{_includedir}/criu
 %{_pkgconfigdir}/criu.pc
 
 %{_includedir}/criu
 %{_pkgconfigdir}/criu.pc