X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;ds=sidebyside;f=lustre.spec.in;h=b4a2f7e31cb1f675e36d10cf35cd8da76d2f0c61;hb=9609d801c293f2d34d695c56684a50c0968a4c87;hp=45a21ff5510a884f5abc9a71625f3fc0f0a3ab36;hpb=8e55e94a602294cffd66040d855837812647e673;p=fs%2Flustre-release.git

diff --git a/lustre.spec.in b/lustre.spec.in
index 45a21ff..b4a2f7e 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/-[^0-9]*smp$//'")
+%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,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
@@ -250,7 +250,7 @@ if sysctl kernel.unsupported >/dev/null 2>&1 &&
    [ "$(sysctl -n kernel.unsupported 2>/dev/null)" = "0" ] &&
     ! modprobe -c | grep -q "^allow_unsupported_modules[ \t]1" ; then
      echo "
-     warning: the Lustre modules are no supported by Novell. To use Lustre
+     warning: the Lustre modules are not supported by Novell. To use Lustre
               on this system, you should put
 
      allow_unsupported_modules 1