aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTodd <18294602+seidelma@users.noreply.github.com>2024-04-23 00:55:41 +0000
committerGitHub <noreply@github.com>2024-04-23 00:55:41 +0000
commit87d81d1d13e0ef848d2d533a4f12f5de41026e73 (patch)
treeab590c9750d6c4bc15cb61cc0f990383f5bcaa38
parent4036b8d027fb7fe1a629b08a0d23cac975ab2eb9 (diff)
downloadsrc-87d81d1d13e0ef848d2d533a4f12f5de41026e73.tar.gz
src-87d81d1d13e0ef848d2d533a4f12f5de41026e73.zip
zfs-kmod: fix empty rpm requires/conflicts
Fix an error in zfs-kmod.spec that causes kmod-zfs packages not to include the correct RPM requires/conflicts relationships. With this change applied, RPM correctly no longer allows kmod-zfs & zfs-dkms packages to be installed together. Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Signed-off-by: Todd Seidelmann <18294602+seidelma@users.noreply.github.com> Closes #16121
-rw-r--r--rpm/redhat/zfs-kmod.spec.in2
1 files changed, 1 insertions, 1 deletions
diff --git a/rpm/redhat/zfs-kmod.spec.in b/rpm/redhat/zfs-kmod.spec.in
index 9c836786baea..876c198c64de 100644
--- a/rpm/redhat/zfs-kmod.spec.in
+++ b/rpm/redhat/zfs-kmod.spec.in
@@ -17,7 +17,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# by generating a preamble text file which kmodtool can append to the spec file.
%(/bin/echo -e "\
Requires: @PACKAGE@ = %{version}\n\
-Conflicts: @PACKAGE@-dkms)
+Conflicts: @PACKAGE@-dkms" > %{_sourcedir}/kmod-preamble)
# LDFLAGS are not sanitized by arch/*/Makefile for these architectures.
%ifarch ppc ppc64 ppc64le aarch64