From: Jan Rękorajski <baggins@pld-linux.org>
Date: Mon, 18 Jun 2018 17:37:41 +0000 (+0200)
Subject: - up to 0.7.9
X-Git-Tag: auto/th/zfs-0.7.9-1
X-Git-Url: https://git.pld-linux.org/?p=packages%2Fzfs.git;a=commitdiff_plain;h=645bf015e81749c81b2ac71719ead90d3e79c016

- up to 0.7.9
---

diff --git a/xattr-in-glibc.patch b/xattr-in-glibc.patch
deleted file mode 100644
index 3c984b5..0000000
--- a/xattr-in-glibc.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- zfs-0.7.3/tests/zfs-tests/cmd/xattrtest/xattrtest.c~	2017-10-18 23:43:13.000000000 +0200
-+++ zfs-0.7.3/tests/zfs-tests/cmd/xattrtest/xattrtest.c	2017-11-18 17:15:18.389310337 +0100
-@@ -37,7 +37,7 @@
- #include <fcntl.h>
- #include <time.h>
- #include <unistd.h>
--#include <attr/xattr.h>
-+#include <sys/xattr.h>
- #include <sys/types.h>
- #include <sys/wait.h>
- #include <sys/stat.h>
---- zfs-0.7.3/tests/zfs-tests/cmd/mktree/mktree.c~	2017-10-18 23:43:13.000000000 +0200
-+++ zfs-0.7.3/tests/zfs-tests/cmd/mktree/mktree.c	2017-11-18 17:15:46.816754985 +0100
-@@ -30,7 +30,7 @@
- #include <unistd.h>
- #include <string.h>
- #include <fcntl.h>
--#include <attr/xattr.h>
-+#include <sys/xattr.h>
- #include <sys/stat.h>
- #include <sys/types.h>
- #include <sys/param.h>
---- zfs-0.7.3/config/user-libattr.m4	2017-10-18 23:43:14.000000000 +0200
-+++ /dev/null	2017-11-04 00:31:38.176382048 +0100
-@@ -1,12 +0,0 @@
--dnl #
--dnl # Check for libattr
--dnl #
--AC_DEFUN([ZFS_AC_CONFIG_USER_LIBATTR], [
--	LIBATTR=
--
--	AC_CHECK_HEADER([attr/xattr.h], [], [AC_MSG_FAILURE([
--	*** attr/xattr.h missing, libattr-devel package required])])
--
--	AC_SUBST([LIBATTR], ["-lattr"])
--	AC_DEFINE([HAVE_LIBATTR], 1, [Define if you have libattr])
--])
---- zfs-0.7.3/config/user.m4~	2017-10-18 23:43:14.000000000 +0200
-+++ zfs-0.7.3/config/user.m4	2017-11-18 17:17:18.399261345 +0100
-@@ -11,7 +11,6 @@
- 	ZFS_AC_CONFIG_USER_LIBUUID
- 	ZFS_AC_CONFIG_USER_LIBTIRPC
- 	ZFS_AC_CONFIG_USER_LIBBLKID
--	ZFS_AC_CONFIG_USER_LIBATTR
- 	ZFS_AC_CONFIG_USER_LIBUDEV
- 	ZFS_AC_CONFIG_USER_FRAME_LARGER_THAN
- 	ZFS_AC_CONFIG_USER_RUNSTATEDIR
diff --git a/zfs.spec b/zfs.spec
index 818f83c..fec1ac1 100644
--- a/zfs.spec
+++ b/zfs.spec
@@ -31,17 +31,16 @@ exit 1
 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.7.7
+Version:	0.7.9
 Release:	%{rel}%{?_pld_builder:%{?with_kernel:@%{_kernel_ver_str}}}
 License:	CDDL (ZFS), GPL v2+ (ZPIOS)
 Group:		Applications/System
 Source0:	https://github.com/zfsonlinux/zfs/releases/download/zfs-%{version}/%{pname}-%{version}.tar.gz
-# Source0-md5:	919f74613bacf3ac2833f34aca146be0
+# Source0-md5:	3c0852807f90061d4902464ab9b25c0e
 Patch0:		%{pname}-link.patch
 Patch1:		x32.patch
-Patch2:		xattr-in-glibc.patch
-Patch3:		randstruct.patch
 URL:		http://zfsonlinux.org/
+Patch3:		randstruct.patch
 BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
 BuildRequires:	libtool
@@ -223,7 +222,6 @@ p=`pwd`\
 %setup -q -n %{pname}-%{version}
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 %patch3 -p1
 
 %build