Backport packages from upstream

1 month ago · 7c7e52e848
6 changed files with 22 additions and 16 deletions
--- a/fedora-42/SOURCES/zfs-2.4.2.tar.gz
+++ b/fedora-42/SOURCES/zfs-2.4.2.tar.gz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5f31def0989a7042d5003089b375f0ded75a5c4246f5935a2c1fd75dd70c4bb5
+size 34522287
--- a/fedora-42/SPECS/zfs-dkms.spec
+++ b/fedora-42/SPECS/zfs-dkms.spec
@ -12,7 +12,7 @@

 Name:           %{module}-dkms

-Version:        2.4.1
+Version:        2.4.2
 Release:        1%{?dist}
 Summary:        Kernel module(s) (dkms)

@ -32,12 +32,12 @@ Requires(post): gcc, make, perl, diffutils

 # Hold back kernel upgrades if kernel is not supported by ZFS
 %if 0%{?rhel}%{?fedora}%{?mageia}%{?suse_version}%{?openEuler}
-Requires:       kernel-devel >= 4.18, kernel-devel <= 6.19.999
-Requires(post): kernel-devel >= 4.18, kernel-devel <= 6.19.999
-Conflicts:      kernel-devel < 4.18, kernel-devel > 6.19.999
-Requires:       kernel-uname-r >= 4.18, kernel-uname-r <= 6.19.999
-Requires(post): kernel-uname-r >= 4.18, kernel-uname-r <= 6.19.999
-Conflicts:      kernel-uname-r < 4.18, kernel-uname-r > 6.19.999
+Requires:       kernel-devel >= 4.18, kernel-devel <= 99.99.999
+Requires(post): kernel-devel >= 4.18, kernel-devel <= 99.99.999
+Conflicts:      kernel-devel < 4.18, kernel-devel > 99.99.999
+Requires:       kernel-uname-r >= 4.18, kernel-uname-r <= 99.99.999
+Requires(post): kernel-uname-r >= 4.18, kernel-uname-r <= 99.99.999
+Conflicts:      kernel-uname-r < 4.18, kernel-uname-r > 99.99.999

 Obsoletes:      spl-dkms <= %{version}
 %endif
--- a/fedora-42/SPECS/zfs.spec
+++ b/fedora-42/SPECS/zfs.spec
@ -102,7 +102,7 @@ sitedir = sysconfig.get_path('purelib', scheme, vars={'base': prefix})
 print(sitedir);" 2>/dev/null || %{__python} -Esc "from distutils import sysconfig; print(sysconfig.get_python_lib(0,0))")

 Name:           zfs
-Version:        2.4.1
+Version:        2.4.2
 Release:        1%{?dist}
 Summary:        Commands to control the kernel modules and libraries

--- a/fedora-43/SOURCES/zfs-2.4.2.tar.gz
+++ b/fedora-43/SOURCES/zfs-2.4.2.tar.gz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f21af162dd8f824bc422caa979db8521c26df646954137e3d3b3f65013fa94b3
+size 34530534
--- a/fedora-43/SPECS/zfs-dkms.spec
+++ b/fedora-43/SPECS/zfs-dkms.spec
@ -12,7 +12,7 @@

 Name:           %{module}-dkms

-Version:        2.4.1
+Version:        2.4.2
 Release:        1%{?dist}
 Summary:        Kernel module(s) (dkms)

@ -32,12 +32,12 @@ Requires(post): gcc, make, perl, diffutils

 # Hold back kernel upgrades if kernel is not supported by ZFS
 %if 0%{?rhel}%{?fedora}%{?mageia}%{?suse_version}%{?openEuler}
-Requires:       kernel-devel >= 4.18, kernel-devel <= 6.19.999
-Requires(post): kernel-devel >= 4.18, kernel-devel <= 6.19.999
-Conflicts:      kernel-devel < 4.18, kernel-devel > 6.19.999
-Requires:       kernel-uname-r >= 4.18, kernel-uname-r <= 6.19.999
-Requires(post): kernel-uname-r >= 4.18, kernel-uname-r <= 6.19.999
-Conflicts:      kernel-uname-r < 4.18, kernel-uname-r > 6.19.999
+Requires:       kernel-devel >= 4.18, kernel-devel <= 99.99.999
+Requires(post): kernel-devel >= 4.18, kernel-devel <= 99.99.999
+Conflicts:      kernel-devel < 4.18, kernel-devel > 99.99.999
+Requires:       kernel-uname-r >= 4.18, kernel-uname-r <= 99.99.999
+Requires(post): kernel-uname-r >= 4.18, kernel-uname-r <= 99.99.999
+Conflicts:      kernel-uname-r < 4.18, kernel-uname-r > 99.99.999

 Obsoletes:      spl-dkms <= %{version}
 %endif
--- a/fedora-43/SPECS/zfs.spec
+++ b/fedora-43/SPECS/zfs.spec
@ -102,7 +102,7 @@ sitedir = sysconfig.get_path('purelib', scheme, vars={'base': prefix})
 print(sitedir);" 2>/dev/null || %{__python} -Esc "from distutils import sysconfig; print(sysconfig.get_python_lib(0,0))")

 Name:           zfs
-Version:        2.4.1
+Version:        2.4.2
 Release:        1%{?dist}
 Summary:        Commands to control the kernel modules and libraries