define vendor explicitly and add pld patch

currently package implicitly depends on lsb-release which makes
configure misdetect os as ubuntu and set bash comp dir to
/usr/share/bash-completion/completions. without lsb-release os detection
fails and ends up with default /etc/bash_completion.d.

skip os auto detection by providing vendor to configure and set
bash comp dir for pld

diff --git a/pld.patch b/pld.patch
new file mode 100644 (file)
index 0000000..6a6f820
--- /dev/null
+++ b/pld.patch
@@ -0,0 +1,10 @@
+--- zfs-2.2.3/config/zfs-build.m4.orig 2024-02-22 18:27:01.262129327 +0100
++++ zfs-2.2.3/config/zfs-build.m4      2024-03-05 09:42:48.042560357 +0100
+@@ -627,6 +627,7 @@
+               debian)     bashcompletiondir=/usr/share/bash-completion/completions   ;;
+               freebsd)    bashcompletiondir=$sysconfdir/bash_completion.d;;
+               gentoo)     bashcompletiondir=/usr/share/bash-completion/completions   ;;
++              pld)        bashcompletiondir=/usr/share/bash-completion/completions   ;;
+               *)          bashcompletiondir=/etc/bash_completion.d   ;;
+       esac
+       AC_MSG_RESULT([$bashcompletiondir])

diff --git a/zfs.spec b/zfs.spec
index fb709ee083e2dfc05485129a3888e08d6003b814..b414b4fdc64c10eb036910f9c6612551589e3c55 100644 (file)
--- a/zfs.spec
+++ b/zfs.spec
@@ -36,6 +36,7 @@ Group:                Applications/System
 Source0:       https://github.com/openzfs/zfs/releases/download/zfs-%{version}/%{pname}-%{version}.tar.gz
 # Source0-md5: e0f2b72ccd47a5b401cbc9f38b1d9073
 Patch0:                initdir.patch
+Patch1:                pld.patch
 URL:           https://zfsonlinux.org/
 BuildRequires: autoconf >= 2.50
 BuildRequires: automake
@@ -259,6 +260,7 @@ p=`pwd`\
 %prep
 %setup -q -n %{pname}-%{version}
 %patch0 -p1
+%patch1 -p1
 
 %{__sed} -E -i -e '1s,#!\s*/usr/bin/env\s+python3(\s|$),#!%{__python3}\1,' \
        cmd/arc_summary
@@ -295,7 +297,8 @@ p=`pwd`\
        --with-systemdpresetdir=/etc/systemd/system-preset \
        --with-systemdmodulesloaddir=/etc/modules-load.d \
        --with-systemdgeneratordir=/lib/systemd/system-generators \
-       --with-udevdir=/lib/udev
+       --with-udevdir=/lib/udev \
+       --with-vendor=pld
 
 %{__make} \
        %{?with_verbose:V=1}