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

diff --git a/lustre.spec.in b/lustre.spec.in
index 2b1903f..7c9f3e5 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,7 +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}
+./configure @ac_configure_args@ %{?configure_flags:configure_flags} \
+	--sysconfdir=%{_sysconfdir} \
+	--mandir=%{_mandir} \
+	--libdir=%{_libdir}
 make -j $RPM_BUILD_NCPUS -s
 
 %install