X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre.spec.in;h=868e8f8c0ce2bcb5474028fa73aa7dbb604b75b9;hp=2b1903fc69af692255ed2e8593de3bd5a3ad2586;hb=88cbf2754651d051288a2b68ff0cf27aea6b502a;hpb=98fd9942abbc7503fc9f1885e58b88887daa6e73

diff --git a/lustre.spec.in b/lustre.spec.in
index 2b1903f..868e8f8 100644
--- a/lustre.spec.in
+++ b/lustre.spec.in
@@ -6,7 +6,7 @@
 
 %define is_client %(bash -c "if [[ %{lustre_name} = *-client ]]; then echo -n '1'; else echo -n '0'; fi")
 # for those uses that don't want the -smp/-bigsmp on the end of %kversion
-%define krequires %(bash -c "echo %{kversion} | sed -e 's/-smp$//' -e 's/-bigsmp$//' -e 's/-ppc64$//' -e 's/-default$//'")
+%define krequires %(bash -c "echo %{kversion} | sed -e 's/.x86_64$//' -e 's/.i586$//' -e 's/-smp$//' -e 's/-bigsmp$//' -e 's/-ppc64$//' -e 's/-default$//'")
 
 Summary: Lustre File System
 Name: %{lustre_name}
@@ -106,6 +106,9 @@ rm -rf $RPM_BUILD_ROOT
 
 # Set an explicit path to our Linux tree, if we can.
 cd $RPM_BUILD_DIR/lustre-%{version}
+# 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
 
@@ -145,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
@@ -185,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