LU-9404 mdt: set HSM xattr only when needed

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

diff --git a/lustre.spec.in b/lustre.spec.in
index ef4c45f..6c41c9f 100644 (file)
--- a/lustre.spec.in
+++ b/lustre.spec.in
@@ -98,7 +98,7 @@ Name: %{lustre_name}
 Version: %{version}
 Release: 1%{?dist}
 License: GPL
-Group: Utilities/System
+Group: System Environment/Kernel
 Source: lustre-%{version}.tar.gz
 Source1: kmp-lustre.preamble
 Source2: kmp-lustre.files
@@ -109,13 +109,12 @@ Source6: kmp-lustre-osd-zfs.files
 Source7: kmp-lustre-tests.files
 URL: https://wiki.hpdd.intel.com/
 BuildRoot: %{_tmppath}/lustre-%{version}-root
-Obsoletes: lustre-lite, lustre-lite-utils, lustre-ldap nfs-utils-lustre
-Provides: lustre-lite = %{version}, lustre-lite-utils = %{version}
 Requires: %{requires_kmod_name} = %{requires_kmod_version}
 BuildRequires: libtool
 %if %{with servers}
 Requires: lustre-osd
 Requires: lustre-osd-mount
+Obsoletes: lustre-client <= %{version}
 Provides: lustre-client = %{version}-%{release}
 %endif
 # GSS requires this: BuildRequires: pkgconfig, libgssapi-devel >= 0.10
@@ -142,8 +141,8 @@ Userspace tools and files for the Lustre file system.
 %if %{with lustre_utils}
 %package osd-ldiskfs-mount
 Summary: osd-ldiskfs-mount contains mount's ldiskfs specific dso.
-Provides: lustre-osd-mount
-Group: Development/Kernel
+Provides: lustre-osd-mount = %{version}-%{fullrelease}
+Group: System Environment/Kernel
 
 %description osd-ldiskfs-mount
 LDISKFS hooks for mount/mkfs into a dynamic library.
@@ -156,8 +155,8 @@ LDISKFS hooks for mount/mkfs into a dynamic library.
 %if %{with lustre_utils}
 %package osd-zfs-mount
 Summary: osd-zfs-mount contains mount's zfs specific dso.
-Provides: lustre-osd-mount
-Group: Development/Kernel
+Provides: lustre-osd-mount = %{version}-%{fullrelease}
+Group: System Environment/Kernel
 
 %description osd-zfs-mount
 ZFS hooks for mount/mkfs into a dynamic library.
@@ -167,9 +166,21 @@ ZFS hooks for mount/mkfs into a dynamic library.
 
 %endif # with lustre_modules
 
+%if %{with servers}
+%package resource-agents
+Summary: HA Resuable Cluster Resource Scripts for Lustre
+Group: System Environment/Base
+Requires: lustre
+Requires: resource-agents
+
+%description resource-agents
+A set of scripts to operate Lustre resources in a High Availablity
+environment for both Pacemaker and rgmanager.
+%endif
+
 %package tests
 Summary: Lustre testing framework
-Group: Development/Kernel
+Group: System Environment/Kernel
 Provides: %{name}-tests = %{version}
 Requires: %{name} = %{version}, lustre-iokit
 Requires: %{requires_kmod_name} = %{requires_kmod_version}
@@ -318,6 +329,11 @@ echo '%{_sysconfdir}/init.d/lnet' >>lustre.files
 echo '%{_sysconfdir}/init.d/lsvcgss' >>lustre.files
 %endif
 
+%if %{with servers}
+mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/ocf/resource.d/lustre/
+install -m 0755 contrib/scripts/pacemaker/* $RPM_BUILD_ROOT%{_prefix}/lib/ocf/resource.d/lustre/
+%endif
+
 # fc18 needs 'x' permission for library files
 find $RPM_BUILD_ROOT -name \*.so -type f -exec chmod +x {} \;
 
@@ -393,7 +409,9 @@ echo '%{_sbindir}/wiretest' >>lustre-tests.files
 %{_sysconfdir}/udev/rules.d/99-lustre.rules
 %config(noreplace) %{_sysconfdir}/ldev.conf
 %config(noreplace) %{_sysconfdir}/modprobe.d/ko2iblnd.conf
-
+%if %{with lustre_utils}
+%config(noreplace) %{_sysconfdir}/lnet_routes.conf
+%endif
 %if %{with lustre_modules}
 
 %if %{with ldiskfs}
@@ -414,6 +432,12 @@ echo '%{_sbindir}/wiretest' >>lustre-tests.files
 
 %endif # with lustre_modules
 
+%if %{with servers}
+%files resource-agents
+%defattr(0755,root,root)
+%{_prefix}/lib/ocf/resource.d/lustre/
+%endif
+
 %if %{with lustre_tests}
 %files tests -f lustre-tests.files
 %defattr(-,root,root)