LU-3624 iokit: fix mds-survey for multiple MDT

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

diff --git a/lustre.spec.in b/lustre.spec.in
index 8d2ccd0..e9b3bc2 100644 (file)
--- a/lustre.spec.in
+++ b/lustre.spec.in
@@ -56,12 +56,6 @@
 # of %kversion
 %define krequires %(bash -c "echo %{kversion} | sed -e 's/\.x86_64$//' -e 's/\.i[3456]86$//' -e 's/-smp$//' -e 's/-bigsmp$//' -e 's/-ppc64$//' -e 's/-default$//'")
 
-%define sles10 %(bash -c "if [ "%sles_version" = "10" ]; then echo -n '1'; else echo -n '0'; fi")
-
-%if %sles10
-%define flavor %(bash -c "echo %{kversion} | sed -e 's/^.*-//'")
-%endif
-
 # Set the package name prefix
 %if %{undefined lustre_name}
     %if %{with servers}
@@ -112,17 +106,12 @@ Requires: %{cross_requires}
 AutoReqProv: no
 %else
 # for SLES11, we need nothing here
-# for SLES10, we need (where %{flavor} is, i.e. smp):
-%if %sles10
-Requires: kernel-%{flavor}
-%else
 %if %{_vendor}=="redhat" || %{_vendor}=="fedora"
 # for RHEL we need to require the specific kernel still since weak-modules
 # support on RH is, well, weak, to be punny about it
 Requires: kernel = %{krequires}
 %endif
 %endif
-%endif
 Group: Development/Kernel
 
 %description modules
@@ -436,7 +425,6 @@ find $RPM_BUILD_ROOT%{?rootdir}/lib/modules/%{kversion}/updates -name "*.ko" -ty
 %endif
 %if %{with ldiskfs}
 %exclude %{?rootdir}/lib/modules/%{kversion}/updates/kernel/fs/lustre/ldiskfs.ko
-%exclude %{?rootdir}/lib/modules/%{kversion}/updates/kernel/fs/lustre/fsfilt_ldiskfs.ko
 %exclude %{?rootdir}/lib/modules/%{kversion}/updates/kernel/fs/lustre/osd_ldiskfs.ko
 %endif
 %if %{with zfs}
@@ -452,7 +440,6 @@ find $RPM_BUILD_ROOT%{?rootdir}/lib/modules/%{kversion}/updates -name "*.ko" -ty
 %if %{with ldiskfs}
 %files osd-ldiskfs
 %attr(-, root, root) %{?rootdir}/lib/modules/%{kversion}/updates/kernel/fs/lustre/ldiskfs.ko
-%attr(-, root, root) %{?rootdir}/lib/modules/%{kversion}/updates/kernel/fs/lustre/fsfilt_ldiskfs.ko
 %attr(-, root, root) %{?rootdir}/lib/modules/%{kversion}/updates/kernel/fs/lustre/osd_ldiskfs.ko
 %if %{defined rpm_post_base}
 %attr(0555, root, root) %{rpm_post_base}-osd-ldiskfs.sh