Accepting request 309628 from home:tiwai:branches:devel:tools

- update to version 1.6:
  * PowerPC 64bit LE support
  * Makefile.local for 3-rd party build rules
  * Ability to "enable" filesystem on dump (--enable-fs)
  * Ability to skip mountpoint on dump (--skip-mnt)
  * Prepare to deprecate "criu show" command
  * External mounts auto-detection
  * /dev/tty (current terminal) support
  * Netdev and netns (all/default) confs C/R
  * Images v1.1 with extra magic at head
  * Support fusectl (only ctl) mountpoint
  * Sub-version format is now as of git-describe
  * Apparamor labels C/R support
- Fix library path for aarch64 and ppc64le
- Fix the prototype for lsm.c (to fix build errors):
  lsm-prototype-fix.diff
- Refreshed crit-install-prefix.diff

OBS-URL: https://build.opensuse.org/request/show/309628
OBS-URL: https://build.opensuse.org/package/show/devel:tools/criu?expand=0&rev=25

criu.spec

@@ -16,9 +16,9 @@
 #
 
 
-%define package_version 1.5.2
+%define package_version 1.6
 Name:           criu
-Version:        1.5.2
+Version:        1.6
 Release:        0
 Summary:        Checkpoint/Restore In Userspace Tools
 License:        GPL-2.0
@@ -26,6 +26,7 @@ Group:          System/Console
 Url:            http://criu.org/
 Source0:        http://download.openvz.org/criu/criu-%{package_version}.tar.bz2
 Patch1:         crit-install-prefix.diff
+Patch2:         lsm-prototype-fix.diff
 BuildRequires:  asciidoc
 BuildRequires:  pkg-config
 BuildRequires:  protobuf-c
@@ -34,7 +35,7 @@ BuildRequires:  xmlto
 BuildRequires:  pkgconfig(systemd)
 Requires:       logrotate
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-ExclusiveArch:  x86_64 aarch64
+ExclusiveArch:  x86_64 aarch64 ppc64le
 
 %description
 Checkpoint/Restore In Userspace, or CRIU, is a software tool for Linux
@@ -66,18 +67,23 @@ to develop applications with CRIU library.
 %prep
 %setup -q -n %{name}-%{package_version}
 %patch1 -p1
+%patch2 -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}"
-make V=1 %{?_smp_mflags} PREFIX=%{_prefix} LOGROTATEDIR=%{_sysconfdir}/logrotate.d/
+make V=1 %{?_smp_mflags} PREFIX=%{_prefix} \
+     LIBDIR=%{_libdir} \
+     LOGROTATEDIR=%{_sysconfdir}/logrotate.d/
 
 %install
 mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d
-make V=1 %{?_smp_mflags} PREFIX=%{_prefix}  LOGROTATEDIR=%{_sysconfdir}/logrotate.d/ \
-    DESTDIR=%{buildroot} install
+make V=1 %{?_smp_mflags} PREFIX=%{_prefix} \
+     LIBDIR=%{_libdir} \
+     LOGROTATEDIR=%{_sysconfdir}/logrotate.d/ \
+     DESTDIR=%{buildroot} install
 # make rpmlint happy
 mv %{buildroot}%{_sysconfdir}/logrotate.d/criu-service \
     %{buildroot}%{_sysconfdir}/logrotate.d/criu
@@ -107,7 +113,7 @@ exit 0
 
 %files
 %defattr(-,root,root)
-%doc README COPYING
+%doc README.md COPYING
 %{_sbindir}/*
 %{_bindir}/*
 %{_mandir}/man*/*