commit d916984604e8cb06b05a3cd56a9c05835d9b0b90
Author: Jan Rękorajski <[email protected]>
Date: Fri Jul 12 21:34:16 2019 +0800
- up to 0.8.1
zfs-sh.patch | 41 -----------------------------------------
zfs.spec | 6 ++----
2 files changed, 2 insertions(+), 45 deletions(-)
---
diff --git a/zfs.spec b/zfs.spec
index 5cb5645..d539bfb 100644
--- a/zfs.spec
+++ b/zfs.spec
@@ -33,16 +33,15 @@ 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.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}/%{pname}-%{version}.tar.gz
-# Source0-md5: 21455e164534ce2a403b0413f3e128f4
+# Source0-md5: db6618a09f6494e1126b14a1302f77c8
Patch0: x32.patch
Patch1: am.patch
-Patch2: zfs-sh.patch
URL: http://zfsonlinux.org/
BuildRequires: autoconf >= 2.50
BuildRequires: automake
@@ -275,7 +274,6 @@ p=`pwd`\
%setup -q -n %{pname}-zfs-%{version}
%patch0 -p1
%patch1 -p1
-%patch2 -p1
%build
%{__libtoolize}
diff --git a/zfs-sh.patch b/zfs-sh.patch
deleted file mode 100644
index 714c23c..0000000
--- a/zfs-sh.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- zfs-zfs-0.8.0-rc4/config/always-python.m4.orig 2019-04-16
22:24:49.000000000 +0200
-+++ zfs-zfs-0.8.0-rc4/config/always-python.m4 2019-05-08 18:38:16.579298208
+0200
-@@ -68,19 +68,19 @@
-
- AM_PATH_PYTHON([2.6], [], [:])
- AM_CONDITIONAL([USING_PYTHON], [test "$PYTHON" != :])
-- AM_CONDITIONAL([USING_PYTHON_2], [test "${PYTHON_VERSION:0:2}" = "2."])
-- AM_CONDITIONAL([USING_PYTHON_3], [test "${PYTHON_VERSION:0:2}" = "3."])
-+ AM_CONDITIONAL([USING_PYTHON_2], [test "${PYTHON_VERSION%%.*}" = "2"])
-+ AM_CONDITIONAL([USING_PYTHON_3], [test "${PYTHON_VERSION%%.*}" = "3"])
-
- dnl #
- dnl # Minimum supported Python versions for utilities:
- dnl # Python 2.6.x, or Python 3.4.x
- dnl #
-- AS_IF([test "${PYTHON_VERSION:0:2}" = "2."], [
-+ AS_IF([test "${PYTHON_VERSION%%.*}" = "2"], [
- ZFS_AC_PYTHON_VERSION([>= '2.6'], [ /bin/true ],
- [AC_MSG_ERROR("Python >= 2.6.x is not available")])
- ])
-
-- AS_IF([test "${PYTHON_VERSION:0:2}" = "3."], [
-+ AS_IF([test "${PYTHON_VERSION%%.*}" = "3"], [
- ZFS_AC_PYTHON_VERSION([>= '3.4'], [ /bin/true ],
- [AC_MSG_ERROR("Python >= 3.4.x is not available")])
- ])
---- zfs-zfs-0.8.0-rc4/config/always-pyzfs.m4.orig 2019-04-16
22:24:49.000000000 +0200
-+++ zfs-zfs-0.8.0-rc4/config/always-pyzfs.m4 2019-05-08 19:29:53.339188287
+0200
-@@ -26,10 +26,10 @@
- dnl # Require python-devel libraries
- dnl #
- AS_IF([test "x$enable_pyzfs" = xcheck -o "x$enable_pyzfs" = xyes], [
-- AS_IF([test "${PYTHON_VERSION:0:2}" = "2."], [
-+ AS_IF([test "${PYTHON_VERSION%%.*}" = "2"], [
- PYTHON_REQUIRED_VERSION=">= '2.7.0'"
- ], [
-- AS_IF([test "${PYTHON_VERSION:0:2}" = "3."], [
-+ AS_IF([test "${PYTHON_VERSION%%.*}" = "3"], [
- PYTHON_REQUIRED_VERSION=">= '3.4.0'"
- ], [
- AC_MSG_ERROR("Python $PYTHON_VERSION unknown")
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/zfs.git/commitdiff/d916984604e8cb06b05a3cd56a9c05835d9b0b90
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
