- added sh patch (kill += bashism in configure)

[packages/zfs.git] / zfs.spec

diff --git a/zfs.spec b/zfs.spec
index d02ac9c87b88be6ff41d36b4530c804297a0abde..6b122a31bda392f5f121b34f97b259c6fe7af5c3 100644 (file)
--- a/zfs.spec
+++ b/zfs.spec
@@ -28,23 +28,21 @@ exit 1
 
 %define                _duplicate_files_terminate_build        0
 
-%define        _rc     rc4
-%define        rel     0.%{_rc}.2
+%define        rel     1
 %define        pname   zfs
 Summary:       Native Linux port of the ZFS filesystem
 Summary(pl.UTF-8):     Natywny linuksowy port systemu plików ZFS
 Name:          %{pname}%{?_pld_builder:%{?with_kernel:-kernel}}%{_alt_kernel}
-Version:       0.8.0
+Version:       0.8.1
 Release:       %{rel}%{?_pld_builder:%{?with_kernel:@%{_kernel_ver_str}}}
 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: 9630df590251ad13a347b10fd46c0922
+Source0:       https://github.com/zfsonlinux/zfs/archive/zfs-%{version}/%{pname}-%{version}.tar.gz
+# Source0-md5: db6618a09f6494e1126b14a1302f77c8
 Patch0:                x32.patch
 Patch1:                am.patch
-Patch2:                highmem.patch
-Patch3:                zfs-sh.patch
+Patch2:                %{name}-sh.patch
 URL:           http://zfsonlinux.org/
 BuildRequires: autoconf >= 2.50
 BuildRequires: automake
@@ -274,11 +272,10 @@ p=`pwd`\
 %{?with_kernel:%{expand:%create_kernel_packages}}
 
 %prep
-%setup -q -n %{pname}-zfs-%{version}-%{_rc}
+%setup -q -n %{pname}-zfs-%{version}
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
 
 %build
 %{__libtoolize}
@@ -291,6 +288,7 @@ p=`pwd`\
 %if %{with userspace}
 %configure \
        --disable-silent-rules \
+       --enable-systemd \
        --with-config="user" \
        --with-linux=%{_kernelsrcdir} \
        --with-systemdunitdir=%{systemdunitdir} \