X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=zfs.spec;h=d02ac9c87b88be6ff41d36b4530c804297a0abde;hb=56fca1f;hp=ec46dc46daeba2d32ab2c92acefe27d5c1991071;hpb=f5cf456e9552ac7b709a82f64de82cca0b1b6d0a;p=packages%2Fzfs.git

diff --git a/zfs.spec b/zfs.spec
index ec46dc4..d02ac9c 100644
--- a/zfs.spec
+++ b/zfs.spec
@@ -28,8 +28,8 @@ exit 1
 
 %define		_duplicate_files_terminate_build	0
 
-%define	_rc	rc3
-%define	rel	0.%{_rc}.3
+%define	_rc	rc4
+%define	rel	0.%{_rc}.2
 %define	pname	zfs
 Summary:	Native Linux port of the ZFS filesystem
 Summary(pl.UTF-8):	Natywny linuksowy port systemu plików ZFS
@@ -40,10 +40,11 @@ License:	CDDL
 Group:		Applications/System
 #Source0:	https://github.com/zfsonlinux/zfs/releases/download/zfs-%{version}/%{pname}-%{version}.tar.gz
 Source0:	https://github.com/zfsonlinux/zfs/archive/zfs-%{version}-%{_rc}/%{pname}-%{version}-%{_rc}.tar.gz
-# Source0-md5:	430cd26a1d246029017e9250eb00f8f2
+# Source0-md5:	9630df590251ad13a347b10fd46c0922
 Patch0:		x32.patch
 Patch1:		am.patch
-Patch2:		kernel-5.0.patch
+Patch2:		highmem.patch
+Patch3:		zfs-sh.patch
 URL:		http://zfsonlinux.org/
 BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
@@ -53,19 +54,30 @@ BuildRequires:	rpmbuild(macros) >= 1.714
 %{expand:%buildrequires_kernel kernel%%{_alt_kernel}-module-build >= 3:2.6.20.2}
 %endif
 %if %{with userspace}
+# only for mmap_libaio test command
+#BuildRequires:	libaio-devel
 BuildRequires:	libblkid-devel
 BuildRequires:	libselinux-devel
+# if xdr gets removed from glibc
+#BuildRequires:	libtirpc-devel
 BuildRequires:	libuuid-devel
+BuildRequires:	openssl-devel
+BuildRequires:	pkgconfig
+BuildRequires:	udev-devel
 BuildRequires:	zlib-devel
 %if %{with python2}
-BuildRequires:	rpm-pythonprov
-BuildRequires:	python-modules
+BuildRequires:	python-cffi
+BuildRequires:	python-modules >= 1:2.6
 BuildRequires:	python-setuptools
 %endif
 %if %{with python3}
-BuildRequires:	python3-modules
+BuildRequires:	python3-cffi
+BuildRequires:	python3-modules >= 1:3.4
 BuildRequires:	python3-setuptools
 %endif
+%if %{with python2} || %{with python3}
+BuildRequires:	rpm-pythonprov
+%endif
 %endif
 Requires:	%{pname}-libs = %{version}-%{release}
 Obsoletes:	spl < 0.7.9-2
@@ -145,22 +157,30 @@ ZFS support for Dracut.
 Obsługa ZFS-a dla Dracuta.
 
 %package -n python-pyzfs
-Summary:	Wrapper for libzfs_core C library
+Summary:	Python 2 wrapper for libzfs_core C library
+Summary(pl.UTF-8):	Interfejs Pythona 2 do biblioteki C libzfs_core
 License:	Apache v2.0
 Group:		Libraries/Python
 Requires:	%{pname}-libs = %{version}-%{release}
 
 %description -n python-pyzfs
-Wrapper for libzfs_core C library.
+Python 2 wrapper for libzfs_core C library.
+
+%description -n python-pyzfs -l pl.UTF-8
+Interfejs Pythona 2 do biblioteki C libzfs_core.
 
 %package -n python3-pyzfs
-Summary:	Wrapper for libzfs_core C library
+Summary:	Python 3 wrapper for libzfs_core C library
+Summary(pl.UTF-8):	Interfejs Pythona 3 do biblioteki C libzfs_core
 License:	Apache v2.0
 Group:		Libraries/Python
 Requires:	%{pname}-libs = %{version}-%{release}
 
 %description -n python3-pyzfs
-Wrapper for libzfs_core C library.
+Python 3 wrapper for libzfs_core C library.
+
+%description -n python3-pyzfs -l pl.UTF-8
+Interfejs Pythona 3 do biblioteki C libzfs_core.
 
 %package -n kernel-zfs-common-devel
 Summary:	ZFS Linux kernel headers
@@ -258,6 +278,7 @@ p=`pwd`\
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 %{__libtoolize}
@@ -351,7 +372,7 @@ rm -rf $RPM_BUILD_ROOT
 %if %{with userspace}
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS COPYRIGHT LICENSE README.md
+%doc AUTHORS COPYRIGHT LICENSE NEWS NOTICE README.md
 %attr(755,root,root) /sbin/mount.zfs
 %attr(755,root,root) %{_bindir}/arc_summary
 %attr(755,root,root) %{_bindir}/arcstat
@@ -470,6 +491,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{dracutlibdir}/modules.d/90zfs/module-setup.sh
 %attr(755,root,root) %{dracutlibdir}/modules.d/90zfs/mount-zfs.sh
 %attr(755,root,root) %{dracutlibdir}/modules.d/90zfs/parse-zfs.sh
+%attr(755,root,root) %{dracutlibdir}/modules.d/90zfs/zfs-env-bootfs.service
 %attr(755,root,root) %{dracutlibdir}/modules.d/90zfs/zfs-generator.sh
 %attr(755,root,root) %{dracutlibdir}/modules.d/90zfs/zfs-lib.sh
 %attr(755,root,root) %{dracutlibdir}/modules.d/90zfs/zfs-load-key.sh