-%files modules -f lustre-modules.files
-%attr(-, root, root) %doc COPYING
-%attr(-, root, root) %doc ChangeLog-lustre
-%attr(-, root, root) %doc ChangeLog-lnet
+%{_bindir}/llobdstat
+%{_bindir}/llstat
+%{_bindir}/plot-llstat
+
+%{_bindir}/lfs
+%{_bindir}/lfs_migrate
+%{?rootdir}/sbin/mount.lustre
+%{_libdir}/libptlctl.a
+%{_libdir}/libcfsutil.a
+%{_libdir}/liblustreapi.a
+%{_libdir}/liblustreapi.so
+%{_mandir}/man?/*
+%{_includedir}/lustre
+%{_includedir}/libcfs
+%{_includedir}/linux/lustre_user.h
+%endif
+%{_datadir}/lustre
+%{_sysconfdir}/udev/rules.d/99-lustre.rules
+%config(noreplace) %{_sysconfdir}/ldev.conf
+
+%if %{with lustre_modules}
+%files modules
+%defattr(-,root,root)
+%{?rootdir}/lib/modules/%{kversion}/%{kmoddir}/*
+%if %{with lustre_tests}
+%exclude %{?rootdir}/lib/modules/%{kversion}/%{kmoddir}/kernel/fs/@PACKAGE@/llog_test.ko
+%endif
+%if %{with ldiskfs}
+%exclude %{?rootdir}/lib/modules/%{kversion}/%{kmoddir}/kernel/fs/@PACKAGE@/ldiskfs.ko
+%exclude %{?rootdir}/lib/modules/%{kversion}/%{kmoddir}/kernel/fs/@PACKAGE@/osd_ldiskfs.ko
+%endif
+%if %{with zfs}
+%exclude %{?rootdir}/lib/modules/%{kversion}/%{kmoddir}/kernel/fs/@PACKAGE@/osd_zfs.ko
+%endif
+%if %{defined rpm_post_base}
+%attr(0555, root, root) %{rpm_post_base}-modules.sh
+%endif
+%doc COPYING
+%doc ChangeLog-lustre
+%doc ChangeLog-lnet
+
+%if %{with ldiskfs}
+%files osd-ldiskfs
+%defattr(-,root,root)
+%{?rootdir}/lib/modules/%{kversion}/%{kmoddir}/kernel/fs/@PACKAGE@/ldiskfs.ko
+%{?rootdir}/lib/modules/%{kversion}/%{kmoddir}/kernel/fs/@PACKAGE@/osd_ldiskfs.ko
+%if %{with lustre_utils}
+%{_libdir}/@PACKAGE@/mount_osd_ldiskfs.so
+%endif
+%if %{defined rpm_post_base}
+%attr(0555, root, root) %{rpm_post_base}-osd-ldiskfs.sh
+%endif
+%endif
+
+%if %{with zfs}
+%files osd-zfs
+%defattr(-,root,root)
+%{?rootdir}/lib/modules/%{kversion}/%{kmoddir}/kernel/fs/@PACKAGE@/osd_zfs.ko
+%if %{with lustre_utils}
+%{_libdir}/@PACKAGE@/mount_osd_zfs.so
+%endif
+%if %{defined rpm_post_base}
+%attr(0555, root, root) %{rpm_post_base}-osd-zfs.sh
+%endif
+%endif
+%endif # with lustre_modules