- added sh patch (kill bashisms in configure)

[packages/zfs.git] / zfs.spec

diff --git a/zfs.spec b/zfs.spec
index 89c303ab00349b8359428ad005b218f5f64e7269..a4021629fd8b59554f05b887c1d7b94efdc1c3c0 100644 (file)
--- a/zfs.spec
+++ b/zfs.spec
@@ -8,7 +8,8 @@
 # Conditional build:
 %bcond_without kernel          # don't build kernel modules
 %bcond_without userspace       # don't build userspace programs
-%bcond_without python          # CPython module
+%bcond_without python2         # CPython 2.x module
+%bcond_without python3         # CPython 3.x module
 %bcond_with    verbose         # verbose build (V=1)
 #
 # The goal here is to have main, userspace, package built once with
@@ -27,8 +28,8 @@ exit 1
 
 %define                _duplicate_files_terminate_build        0
 
-%define        _rc     rc2
-%define        rel     0.%{_rc}.1
+%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
@@ -39,9 +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: c32e6373ae1b4524f25e97917a1fa68a
+# Source0-md5: 9630df590251ad13a347b10fd46c0922
 Patch0:                x32.patch
 Patch1:                am.patch
+Patch2:                highmem.patch
+Patch3:                zfs-sh.patch
 URL:           http://zfsonlinux.org/
 BuildRequires: autoconf >= 2.50
 BuildRequires: automake
@@ -51,15 +54,28 @@ 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 python}
+%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-cffi
+BuildRequires: python3-modules >= 1:3.4
+BuildRequires: python3-setuptools
+%endif
 %endif
 Requires:      %{pname}-libs = %{version}-%{release}
 Obsoletes:     spl < 0.7.9-2
@@ -147,6 +163,15 @@ Requires:  %{pname}-libs = %{version}-%{release}
 %description -n python-pyzfs
 Wrapper for libzfs_core C library.
 
+%package -n python3-pyzfs
+Summary:       Wrapper for libzfs_core C library
+License:       Apache v2.0
+Group:         Libraries/Python
+Requires:      %{pname}-libs = %{version}-%{release}
+
+%description -n python3-pyzfs
+Wrapper for libzfs_core C library.
+
 %package -n kernel-zfs-common-devel
 Summary:       ZFS Linux kernel headers
 Summary(pl.UTF-8):     ZFS - pliki nagłówkowe jądra Linuksa
@@ -242,6 +267,8 @@ p=`pwd`\
 %setup -q -n %{pname}-zfs-%{version}-%{_rc}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 %build
 %{__libtoolize}
@@ -265,9 +292,15 @@ p=`pwd`\
 %{__make} \
        %{?with_verbose:V=1}
 
-%if %{with python}
+%if %{with python2}
+cd contrib/pyzfs
+%py_build
+cd ../..
+%endif
+
+%if %{with python3}
 cd contrib/pyzfs
-%py_build %{?with_tests:test}
+%py3_build
 cd ../..
 %endif
 %endif
@@ -287,7 +320,7 @@ cp -a installed/* $RPM_BUILD_ROOT
        DESTDIR=$RPM_BUILD_ROOT \
        DEFAULT_INIT_DIR=/etc/rc.d/init.d
 
-%if %{with python}
+%if %{with python2}
 %{__rm} -rf $RPM_BUILD_ROOT%{py_sitescriptdir}
 cd contrib/pyzfs
 %py_install
@@ -300,6 +333,14 @@ cd ../..
 %{__rm} -r $RPM_BUILD_ROOT%{py_sitescriptdir}/libzfs_core/test
 %endif
 
+%if %{with python3}
+%{__rm} -rf $RPM_BUILD_ROOT{%{py3_sitescriptdir},/usr/local/share/python3*}
+cd contrib/pyzfs
+%py3_install
+cd ../..
+%{__rm} -r $RPM_BUILD_ROOT%{py3_sitescriptdir}/libzfs_core/test
+%endif
+
 install -d $RPM_BUILD_ROOT%{_pkgconfigdir}
 %{__mv} $RPM_BUILD_ROOT%{_npkgconfigdir}/* $RPM_BUILD_ROOT%{_pkgconfigdir}
 
@@ -321,11 +362,11 @@ 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.py
-%attr(755,root,root) %{_bindir}/arcstat.py
-%attr(755,root,root) %{_bindir}/dbufstat.py
+%attr(755,root,root) %{_bindir}/arc_summary
+%attr(755,root,root) %{_bindir}/arcstat
+%attr(755,root,root) %{_bindir}/dbufstat
 %attr(755,root,root) %{_bindir}/zgenhostid
 %attr(755,root,root) %{_sbindir}/fsck.zfs
 %attr(755,root,root) %{_sbindir}/zdb
@@ -440,18 +481,27 @@ 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
 %attr(755,root,root) %{dracutlibdir}/modules.d/90zfs/zfs-needshutdown.sh
 
-%if %{with python}
+%if %{with python2}
 %files -n python-pyzfs
 %defattr(644,root,root,755)
 %doc contrib/pyzfs/README
 %{py_sitescriptdir}/libzfs_core
 %{py_sitescriptdir}/pyzfs-*-py*.egg-info
 %endif
+
+%if %{with python3}
+%files -n python3-pyzfs
+%defattr(644,root,root,755)
+%doc contrib/pyzfs/README
+%{py3_sitescriptdir}/libzfs_core
+%{py3_sitescriptdir}/pyzfs-*-py*.egg-info
+%endif
 %endif
 
 %if %{with kernel}