LU-7860 ldlm: revert part of commit 657bbc49

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

diff --git a/lustre.spec.in b/lustre.spec.in
index 337c80c..ce40332 100644 (file)
--- a/lustre.spec.in
+++ b/lustre.spec.in
@@ -186,13 +186,6 @@ ZFS hooks for mount/mkfs into a dynamic library.
 %endif
 %endif # with lustre_modules
 
-%package source
-Summary: Object-Based Disk storage driver source
-Group: Development/Kernel
-
-%description source
-Lustre sources for further development
-
 # Since the RPMs we ship are to be used on both SLES and RHEL, we
 # can't include any dependency information (since the package names
 # are different on the two platforms).
@@ -344,19 +337,13 @@ echo '%{_sysconfdir}/ha.d/resource.d/Lustre' >>lustre.files
 # The following scripts are Red Hat specific
 %if %{with servers}
 echo '%{_sysconfdir}/sysconfig/lustre' >>lustre.files
+echo '%{_sysconfdir}/sysconfig/lsvcgss' >>lustre.files
 echo '%{_sysconfdir}/init.d/lustre' >>lustre.files
 %endif
 echo '%{_sysconfdir}/init.d/lnet' >>lustre.files
 echo '%{_sysconfdir}/init.d/lsvcgss' >>lustre.files
 %endif
 
-# Create the pristine source directory.
-cd $RPM_BUILD_DIR/lustre-%{version}
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/src
-rm -f lustre-source
-ln -s $RPM_BUILD_ROOT%{_prefix}/src lustre-source
-make distdir distdir=lustre-source/lustre-%{version}
-chmod -R go-w lustre-source/lustre-%{version}
 # fc18 needs 'x' permission for library files
 find $RPM_BUILD_ROOT -name \*.so -type f -exec chmod +x {} \;
 
@@ -382,6 +369,11 @@ fi
 find $RPM_BUILD_ROOT%{_libdir}/@PACKAGE@ \
     -name \*.la -type f -exec rm -f {} \;
 
+%if %{with lustre_modules}
+# mark modules executable for find-debuginfo.sh
+find $RPM_BUILD_ROOT/lib/modules -name \*.ko -type f -exec chmod u+x {} \;
+%endif
+
 %if %{with lustre_tests}
 echo '%{_libdir}/lustre/tests/*' >>lustre-tests.files
 echo '%{_bindir}/mcreate' >>lustre-tests.files
@@ -474,10 +466,6 @@ echo '/lib/modules/%{kversion}/%{kmoddir}/kernel/fs/@PACKAGE@/llog_test.ko' >>lu
 %endif
 %endif # with lustre_modules
 
-%files source
-%defattr(-,root,root)
-%{_prefix}/src/lustre-%{version}
-
 # uncomment these lines to enable deps packages
 # %files deps-sles
 # %files deps-rhel