[packages/zfs] - up to 0.8.0 release

[baggins]

commit ea5a5e2d710a15bc19ad945236e9173be8685ee8
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sat May 25 08:56:03 2019 +0200

    - up to 0.8.0 release

 highmem.patch | 24 ------------------------
 zfs.spec      | 13 +++++--------
 2 files changed, 5 insertions(+), 32 deletions(-)
---
diff --git a/zfs.spec b/zfs.spec
index d02ac9c..5cb5645 100644
--- a/zfs.spec
+++ b/zfs.spec
@@ -28,8 +28,7 @@ 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
@@ -39,12 +38,11 @@ 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:	21455e164534ce2a403b0413f3e128f4
 Patch0:		x32.patch
 Patch1:		am.patch
-Patch2:		highmem.patch
-Patch3:		zfs-sh.patch
+Patch2:		zfs-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}
diff --git a/highmem.patch b/highmem.patch
deleted file mode 100644
index 9082274..0000000
--- a/highmem.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- zfs-zfs-0.8.0-rc4/include/spl/sys/vmsystm.h~	2019-04-16 22:24:49.000000000 +0200
-+++ zfs-zfs-0.8.0-rc4/include/spl/sys/vmsystm.h	2019-05-08 09:23:11.033988914 +0200
-@@ -35,8 +35,10 @@
- 
- #ifdef HAVE_TOTALRAM_PAGES_FUNC
- #define	zfs_totalram_pages	totalram_pages()
-+#define	zfs_totalhigh_pages	totalhigh_pages()
- #else
- #define	zfs_totalram_pages	totalram_pages
-+#define	zfs_totalhigh_pages	totalhigh_pages
- #endif
- 
- #define	membar_producer()		smp_wmb()
---- zfs-zfs-0.8.0-rc4/module/zfs/arc.c~	2019-04-16 22:24:49.000000000 +0200
-+++ zfs-zfs-0.8.0-rc4/module/zfs/arc.c	2019-05-08 09:23:53.410611854 +0200
-@@ -4828,7 +4828,7 @@
- {
- #ifdef _KERNEL
- #ifdef CONFIG_HIGHMEM
--	return (ptob(zfs_totalram_pages - totalhigh_pages));
-+	return (ptob(zfs_totalram_pages - zfs_totalhigh_pages));
- #else
- 	return (ptob(zfs_totalram_pages));
- #endif /* CONFIG_HIGHMEM */
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/zfs.git/commitdiff/ea5a5e2d710a15bc19ad945236e9173be8685ee8