LU-12214 build: fixes if the name is not just 'lustre'

fix using a %{name} macro in spec file.
this allow to have right names for server packages.

Cray-bug-id: LUS-5915
Test-parameters: trivial
Change-Id: I2ae271b5344fb899bb053f82d2534355ce60aa3a
Signed-off-by: Alexey Lyashkov <c17817@cray.com>
Reviewed-on: https://review.whamcloud.com/36424
Reviewed-by: Shaun Tancheff <shaun.tancheff@hpe.com>
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Alexander Boyko <c17825@cray.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>

diff --git a/lustre.spec.in b/lustre.spec.in
index 48cb0f7..3777f6c 100644 (file)
--- a/lustre.spec.in
+++ b/lustre.spec.in
@@ -154,9 +154,12 @@ BuildRequires: pkg-config
 %if %{with servers}
 Requires: lustre-osd
 Requires: lustre-osd-mount
+Obsoletes: lustre-server < %{version}
+Provides: lustre-server = %{version}-%{release}
+%endif
 Obsoletes: lustre-client < %{version}
 Provides: lustre-client = %{version}-%{release}
-%endif
+
 # GSS requires this: BuildRequires: libgssapi-devel >= 0.10
 %if %{_vendor}=="redhat" || %{_vendor}=="fedora"
 #suse don't support selinux
@@ -216,6 +219,7 @@ Summary: osd-ldiskfs-mount contains mount's ldiskfs specific dso.
 BuildRequires: e2fsprogs-devel
 Requires: ldiskfsprogs
 Provides: lustre-osd-mount = %{version}
+Obsoletes: lustre-osd-mount < %{version}
 Group: System Environment/Kernel
 
 %description osd-ldiskfs-mount
@@ -230,6 +234,7 @@ LDISKFS hooks for mount/mkfs into a dynamic library.
 %package osd-zfs-mount
 Summary: osd-zfs-mount contains mount's zfs specific dso.
 Provides: lustre-osd-mount = %{version}
+Obsoletes: lustre-osd-mount < %{version}
 Group: System Environment/Kernel
 
 %description osd-zfs-mount
@@ -244,7 +249,7 @@ ZFS hooks for mount/mkfs into a dynamic library.
 %package resource-agents
 Summary: HA Resuable Cluster Resource Scripts for Lustre
 Group: System Environment/Base
-Requires: lustre
+Requires: %{name}
 Requires: resource-agents
 
 %description resource-agents
@@ -256,12 +261,11 @@ environment for both Pacemaker and rgmanager.
 %package tests
 Summary: Lustre testing framework
 Group: System Environment/Kernel
-Provides: %{name}-tests = %{version}
+Provides: lustre-tests = %{version}
 %if %{with lustre_iokit}
-Requires: %{name} = %{version}, lustre-iokit
-%else
-Requires: %{name} = %{version}
+Requires: lustre-iokit
 %endif
+Requires: lustre-client = %{version}
 Requires: %{requires_kmod_name} = %{requires_kmod_version}
 Requires: %{requires_kmod_tests_name} = %{requires_kmod_version}
 Requires: attr, rsync, perl, lsof, libtool, /usr/bin/getconf
@@ -396,7 +400,7 @@ make install DESTDIR=$RPM_BUILD_ROOT
 # RHEL, we handle this here in the spec file rather than in
 # Lustre's build system.  This is not expected to bother SLES's
 # kernel_module_path macro.
-basemodpath=$RPM_BUILD_ROOT%{modules_fs_path}/%{lustre_name}
+basemodpath=$RPM_BUILD_ROOT%{modules_fs_path}/%{name}
 %if %{with ldiskfs}
 mkdir -p $basemodpath-osd-ldiskfs/fs
 mv $basemodpath/fs/osd_ldiskfs.ko $basemodpath-osd-ldiskfs/fs/osd_ldiskfs.ko

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

diff --git a/rpm/kmp-lustre-osd-zfs.preamble b/rpm/kmp-lustre-osd-zfs.preamble
index c8db093..50ba25b 100644 (file)
--- a/rpm/kmp-lustre-osd-zfs.preamble
+++ b/rpm/kmp-lustre-osd-zfs.preamble
@@ -1,4 +1,4 @@
 Requires:       zfs-kmod
-Requires:       %{name}-osd-zfs-mount = %{version}
-Provides:       %{name}-osd = %{version}
-Obsoletes:      %{name}-osd-zfs < %{version}
+Requires:       lustre-osd-zfs-mount = %{version}
+Provides:       lustre-osd = %{version}
+Obsoletes:      lustre-osd-zfs < %{version}