- updated to 2.4.2

diff --git a/zfs.spec b/zfs.spec
index 639e54ba8baa54f384d1a32464b301dfb7bb2763..5be049707b274ad266dfbc312190d77012bc3604 100644 (file)
--- a/zfs.spec
+++ b/zfs.spec
@@ -29,12 +29,12 @@ 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}
 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:       2.3.7
+Version:       2.4.2

 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
 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: 6b2750b85d1f41c5c704f7396985730b
+# Source0-md5: a585680cfca997601e5ac80af303c88a

 Patch0:                initdir.patch
 Patch1:                tld.patch
 URL:           https://zfsonlinux.org/
 Patch0:                initdir.patch
 Patch1:                tld.patch
 URL:           https://zfsonlinux.org/


@@ -266,10 +266,10 @@ p=`pwd`\
 %patch -P 1 -p1
 
 %{__sed} -E -i -e '1s,#!\s*/usr/bin/env\s+python3(\s|$),#!%{__python3}\1,' \
 %patch -P 1 -p1
 
 %{__sed} -E -i -e '1s,#!\s*/usr/bin/env\s+python3(\s|$),#!%{__python3}\1,' \

-       cmd/arc_summary
+       cmd/zarcsummary

 
 %{__sed} -E -i -e '1s,#!\s*/usr/bin/env\s+@PYTHON_SHEBANG@(\s|$),#!%{__python3}\1,' \
 
 %{__sed} -E -i -e '1s,#!\s*/usr/bin/env\s+@PYTHON_SHEBANG@(\s|$),#!%{__python3}\1,' \

-       cmd/arcstat.in \
+       cmd/zarcstat.in \

        cmd/dbufstat.in \
        cmd/zilstat.in
 
        cmd/dbufstat.in \
        cmd/zilstat.in
 


@@ -353,9 +353,9 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc AUTHORS COPYRIGHT LICENSE NEWS NOTICE README.md
 %attr(755,root,root) /sbin/mount.zfs
 %defattr(644,root,root,755)
 %doc AUTHORS COPYRIGHT LICENSE NEWS NOTICE README.md
 %attr(755,root,root) /sbin/mount.zfs

-%attr(755,root,root) %{_bindir}/arc_summary
-%attr(755,root,root) %{_bindir}/arcstat

 %attr(755,root,root) %{_bindir}/dbufstat
 %attr(755,root,root) %{_bindir}/dbufstat

+%attr(755,root,root) %{_bindir}/zarcstat
+%attr(755,root,root) %{_bindir}/zarcsummary

 %attr(755,root,root) %{_bindir}/zilstat
 %attr(755,root,root) %{_bindir}/zvol_wait
 %attr(755,root,root) %{_sbindir}/fsck.zfs
 %attr(755,root,root) %{_bindir}/zilstat
 %attr(755,root,root) %{_bindir}/zvol_wait
 %attr(755,root,root) %{_sbindir}/fsck.zfs


@@ -404,7 +404,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/zfs/compatibility.d
 %{bash_compdir}/zfs
 %{bash_compdir}/zpool
 %{_datadir}/zfs/compatibility.d
 %{bash_compdir}/zfs
 %{bash_compdir}/zpool

-%{_mandir}/man1/arcstat.1*
+%{_mandir}/man1/zarcstat.1*

 %{_mandir}/man1/zhack.1*
 %{_mandir}/man1/ztest.1*
 %{_mandir}/man1/zvol_wait.1*
 %{_mandir}/man1/zhack.1*
 %{_mandir}/man1/ztest.1*
 %{_mandir}/man1/zvol_wait.1*


@@ -510,13 +510,13 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/libuutil.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libuutil.so.3
 %attr(755,root,root) %{_libdir}/libzfs.so.*.*.*
 %attr(755,root,root) %{_libdir}/libuutil.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libuutil.so.3
 %attr(755,root,root) %{_libdir}/libzfs.so.*.*.*

-%attr(755,root,root) %ghost %{_libdir}/libzfs.so.6
+%attr(755,root,root) %ghost %{_libdir}/libzfs.so.7

 %attr(755,root,root) %{_libdir}/libzfs_core.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libzfs_core.so.3
 %attr(755,root,root) %{_libdir}/libzfsbootenv.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libzfsbootenv.so.1
 %attr(755,root,root) %{_libdir}/libzpool.so.*.*.*
 %attr(755,root,root) %{_libdir}/libzfs_core.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libzfs_core.so.3
 %attr(755,root,root) %{_libdir}/libzfsbootenv.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libzfsbootenv.so.1
 %attr(755,root,root) %{_libdir}/libzpool.so.*.*.*

-%attr(755,root,root) %ghost %{_libdir}/libzpool.so.6
+%attr(755,root,root) %ghost %{_libdir}/libzpool.so.7

 
 %files devel
 %defattr(644,root,root,755)
 
 %files devel
 %defattr(644,root,root,755)