LU-13906 build: Fix %{name}-osd-ldiskfs-mount

The following error occurs during installation:

error: Failed dependencies:
    lustre-osd-ldiskfs-mount = 2.14.57_56_g4d94d2f is needed by
    kmod-lustre_ib-osd-ldiskfs-2.14.57_56_g4d94d2f-1.el8.x86_64

Test-Parameters: trivial
Signed-off-by: Shaun Tancheff <shaun.tancheff@hpe.com>
Change-Id: Idbcdbd5a1e7793c1359f90c1035ded9fe8e90576
Reviewed-on: https://review.whamcloud.com/46341
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Reviewed-by: Petros Koutoupis <petros.koutoupis@hpe.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>

diff --git a/lustre.spec.in b/lustre.spec.in
index 65aa4fb..b67b4a2 100644 (file)
--- a/lustre.spec.in
+++ b/lustre.spec.in
@@ -204,8 +204,8 @@ BuildRequires: pkg-config
 BuildRequires: krb5-devel openssl-devel
 %endif
 %if %{with servers}
-Requires: lustre-osd
-Requires: lustre-osd-mount
+Requires: %{name}-osd
+Requires: %{name}-osd-mount
 Obsoletes: lustre-server < %{version}
 Provides: lustre-server = %{version}-%{release}
 %endif

diff --git a/rpm/kmp-lustre-osd-ldiskfs.preamble b/rpm/kmp-lustre-osd-ldiskfs.preamble
index e54b383..680373f 100644 (file)
--- a/rpm/kmp-lustre-osd-ldiskfs.preamble
+++ b/rpm/kmp-lustre-osd-ldiskfs.preamble
@@ -1,8 +1,8 @@
 Requires:       %{requires_kmod_name} = %{requires_kmod_version}
 Requires:       ldiskfsprogs >= 1.44.3.wc1
-Requires:       lustre-osd-ldiskfs-mount = %{version}
-Provides:       lustre-osd = %{version}
+Requires:       %{name}-osd-ldiskfs-mount = %{version}
 Provides:       %{name}-osd = %{version}
+Provides:       lustre-osd = %{version}
 Obsoletes:      %{name}-ldiskfs < %{version}
 Obsoletes:      %{name}-osd-ldiskfs < %{version}
 Obsoletes:      lustre-ldiskfs < %{version}