b=22244 delegate lock cancel to blocking thread

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

diff --git a/lustre.spec.in b/lustre.spec.in
index 7c9f3e5..868e8f8 100644 (file)
--- a/lustre.spec.in
+++ b/lustre.spec.in
@@ -106,10 +106,10 @@ rm -rf $RPM_BUILD_ROOT
 
 # Set an explicit path to our Linux tree, if we can.
 cd $RPM_BUILD_DIR/lustre-%{version}
-./configure @ac_configure_args@ %{?configure_flags:configure_flags} \
-       --sysconfdir=%{_sysconfdir} \
-       --mandir=%{_mandir} \
-       --libdir=%{_libdir}
+# override %optflags so that the vendor's overzealous flags don't create
+# build failures
+%define optflags -g -O2 -Werror
+%configure @ac_configure_args@ %{?configure_flags:configure_flags}
 make -j $RPM_BUILD_NCPUS -s
 
 %install
@@ -148,7 +148,7 @@ cat >lustre.files <<EOF
 
 %attr(-, root, root) %{_mandir}/man?/*
 
-%attr(-, root, root) %{_libdir}/lustre/lc_common
+%attr(-, root, root) %{_libexecdir}/lustre/lc_common
 EOF
 
 if [ -f $RPM_BUILD_ROOT%{_libdir}/libcfsutil.a ] ; then
@@ -188,7 +188,7 @@ if [ -d $RPM_BUILD_ROOT%{_libdir}/lustre/liblustre/tests ] ; then
 fi
 
 pushd $RPM_BUILD_ROOT >/dev/null
-find lib/modules/%{kversion}/kernel -type f | awk "!/($modules_excludes)/ {print \"/\"\$0}" >>$RPM_BUILD_DIR/lustre-%{version}/lustre-modules.files
+find lib/modules/%{kversion}/kernel -type f | awk "!/($modules_excludes)/ {print \"%attr(-, root, root) /\"\$0}" >>$RPM_BUILD_DIR/lustre-%{version}/lustre-modules.files
 popd >/dev/null
 
 %files -f lustre.files