- up to 0.8.5

[packages/zfs.git] / zfs.spec

diff --git a/zfs.spec b/zfs.spec
index 96b57dd91c969194773ec6a2b077106ae48341bb..cad24228e7a030b4c78162f8f1d348d5cd07517a 100644 (file)
--- a/zfs.spec
+++ b/zfs.spec
@@ -28,22 +28,21 @@ exit 1
 
 %define                _duplicate_files_terminate_build        0
 
-%define        rel     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.4
+Version:       0.8.5
 Release:       %{rel}%{?_pld_builder:%{?with_kernel:@%{_kernel_ver_str}}}
 License:       CDDL
 Group:         Applications/System
 Source0:       https://github.com/openzfs/zfs/releases/download/zfs-%{version}/%{pname}-%{version}.tar.gz
-# Source0-md5: f0c203c59c4fcd44187a64758707469f
+# Source0-md5: 905cc25c252999bd2049165eea90c975
 Patch0:                x32.patch
 Patch1:                am.patch
 Patch2:                %{pname}-sh.patch
 Patch3:                link.patch
-Patch4:                kernel-5.8.patch
 URL:           https://zfsonlinux.org/
 BuildRequires: autoconf >= 2.50
 BuildRequires: automake
@@ -278,7 +277,6 @@ p=`pwd`\
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
 
 %{__sed} -E -i -e '1s,#!\s*/usr/bin/env\s+python2(\s|$),#!%{__python}\1,' \
       cmd/arc_summary/arc_summary2
@@ -353,16 +351,13 @@ cd ../..
 %endif
 
 %if %{with python3}
-%{__rm} -rf $RPM_BUILD_ROOT{%{py3_sitescriptdir},/usr/local/share/python3*}
+%{__rm} -r $RPM_BUILD_ROOT/usr/local/%{_lib}/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}
-
 # Debian specific stuff
 %{__rm} -r $RPM_BUILD_ROOT%{_datadir}/initramfs-tools