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

[fs/lustre-release.git] / lustre.spec.in

diff --git a/lustre.spec.in b/lustre.spec.in
index 6d09e2d..3777f6c 100644 (file)
--- a/lustre.spec.in
+++ b/lustre.spec.in
@@ -92,8 +92,6 @@
 %if %{_vendor}=="redhat" || %{_vendor}=="fedora"
        %global requires_yaml_name libyaml
        %global requires_kmod_name kmod-%{lustre_name}
-       %global requires_kmod_osd_zfs_name kmod-%{lustre_name}-osd-zfs
-       %global requires_kmod_zfs_name kmod-zfs
        %if %{with lustre_tests}
                %global requires_kmod_tests_name kmod-%{lustre_name}-tests
        %endif
@@ -101,8 +99,6 @@
 %else  #for Suse
        %global requires_yaml_name libyaml-0-2
        %global requires_kmod_name %{lustre_name}-kmp
-       %global requires_kmod_osd_zfs_name %{lustre_name}-osd-zfs-kmp
-       %global requires_kmod_zfs_name kmod-zfs
        %if %{with lustre_tests}
                %global requires_kmod_tests_name %{lustre_name}-tests-kmp
        %endif
@@ -158,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
@@ -217,7 +216,10 @@ echo $TMPFILE
 %if %{with lustre_utils}
 %package osd-ldiskfs-mount
 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
@@ -232,9 +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}
-Requires: zfs
-Requires: %{requires_kmod_zfs_name}
-Requires: %{requires_kmod_osd_zfs_name}
+Obsoletes: lustre-osd-mount < %{version}
 Group: System Environment/Kernel
 
 %description osd-zfs-mount
@@ -249,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
@@ -261,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
@@ -401,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