X-Git-Url: http://git.pld-linux.org/?p=packages%2Fcriu.git;a=blobdiff_plain;f=criu.spec;h=c96258178040f9704c9c0ddff0220736122a4ee7;hp=02ecd111b05ee31a5c902f677b9b1f3255ec3ab9;hb=a27aad5;hpb=6e51e7f7930a21cc2ab8fb7dd68537996940d1cf

diff --git a/criu.spec b/criu.spec
index 02ecd11..c962581 100644
--- a/criu.spec
+++ b/criu.spec
@@ -1,32 +1,34 @@
 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.5
 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:	5d5115454d110adb744e885d82d2c1f6
 Patch0:		%{name}-python.patch
 URL:		http://criu.org/
 BuildRequires:	asciidoc
 BuildRequires:	libcap-devel
 BuildRequires:	libnl-devel >= 1:3.2
 BuildRequires:	pkgconfig
-BuildRequires:	protobuf-c-devel
 BuildRequires:	protobuf
+BuildRequires:	protobuf-c-devel
 BuildRequires:	protobuf-devel
 BuildRequires:	python >= 2
 BuildRequires:	python-modules
 BuildRequires:	rpm-pythonprov
-BuildRequires:	rpmbuild(macros) >= 1.228
+BuildRequires:	rpmbuild(macros) >= 1.697
 BuildRequires:	sed >= 4.0
 Requires:	%{name}-libs = %{version}-%{release}
-Requires:	iproute2 >= 3.6
-Requires:	uname(release) >= 3.9
-ExclusiveArch:	%{x8664} arm aarch64 ppc64
+Requires:	iproute2 >= 3.5
+Requires:	uname(release) >= 3.11
+ExclusiveArch:	%{x8664} %{arm} aarch64 ppc64
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define		_libexecdir	%{_prefix}/lib
+
 %description
 Checkpoint/Restore In Userspace, or CRIU, is a software tool for Linux
 operating system. Using this tool, you can freeze a running
@@ -97,27 +99,28 @@ Pythonowy interfejs do CRIU. Ten pakiet zawiera także narzędzie crit.
 %{__sed} -i -e 's#-O2 -g#$(OPT)#g' Makefile
 
 %build
-%{__make} \
-	DEB_HOST_MULTIARCH= \
-	CC="%{__cc}" \
-	OPT="%{rpmcppflags} %{rpmcflags}" \
-	PREFIX=%{_prefix} \
-	LIBDIR=%{_libdir} \
-	LOGROTATEDIR=%{_sysconfdir}/logrotate.d \
-	V=1 \
-	WERROR=0
+%define _make_opts \\\
+	DEB_HOST_MULTIARCH= \\\
+	CC="%{__cc}" \\\
+	OPT="%{rpmcppflags} %{rpmcflags}" \\\
+	PREFIX=%{_prefix} \\\
+	LIBDIR=%{_libdir} \\\
+	LOGROTATEDIR=%{_sysconfdir}/logrotate.d \\\
+	LIBEXECDIR=%{_libexecdir} \\\
+	PYSITESCRIPTDIR=%{py_sitescriptdir} \\\
+	MANDIR=%{_mandir} \\\
+	WERROR=0 \\\
+	V=1
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 %{__make} install \
-	DEB_HOST_MULTIARCH= \
-	PREFIX=%{_prefix} \
-	LIBDIR=%{_libdir} \
-	PYSITESCRIPTDIR=%{py_sitescriptdir} \
-	LOGROTATEDIR=%{_sysconfdir}/logrotate.d \
-	MANDIR=%{_mandir} \
 	DESTDIR=$RPM_BUILD_ROOT
 
+# optional script, do not autogenerate bash dep
+chmod -x $RPM_BUILD_ROOT%{_libexecdir}/%{name}/scripts/systemd-autofs-restart.sh
+
 %py_postclean
 
 %clean
@@ -128,9 +131,12 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc CREDITS README.md
+%doc CREDITS README.md contrib
 %attr(755,root,root) %{_sbindir}/criu
 %{_mandir}/man8/criu.8*
+%dir %{_libexecdir}/%{name}
+%dir %{_libexecdir}/%{name}/scripts
+%{_libexecdir}/%{name}/scripts/systemd-autofs-restart.sh
 
 %files libs
 %defattr(644,root,root,755)