X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre.spec.in;h=c20ff843d8e6f1286265f5d9c8b1bfafe0b6e559;hp=6b84c0b3ab04be41a5c17f0109342a4e2847810b;hb=dd2a3f8fa0e95c707121855c6d5acf01b2e1c855;hpb=2ccda307213e93439fb3e182eb2618f8dac21419

diff --git a/lustre.spec.in b/lustre.spec.in
index 6b84c0b..c20ff84 100644
--- a/lustre.spec.in
+++ b/lustre.spec.in
@@ -9,6 +9,7 @@
 %bcond_without lustre_iokit
 %bcond_without lustre_modules
 %bcond_with lnet_dlc
+%bcond_without manpages
 
 %if %{without servers}
     # --without servers overrides --with {ldiskfs|zfs}
@@ -59,7 +60,7 @@
 
 # for those uses that don't want the -smp/-bigsmp (or the .arch) on the end
 # of %kversion
-%define krequires %(echo %{kversion} | sed -e 's/\.x86_64$//' -e 's/\.i[3456]86$//' -e 's/-smp$//' -e 's/-bigsmp$//' -e 's/-ppc64$//' -e 's/-default$//')
+%define krequires %(echo %{kversion} | sed -e 's/\.x86_64$//' -e 's/\.i[3456]86$//' -e 's/-smp$//' -e 's/-bigsmp$//' -e 's/[-.]ppc64$//' -e 's/-default$//')
 
 # Set the package name prefix
 %if %{undefined lustre_name}
@@ -107,6 +108,9 @@ Obsoletes: lustre-lite, lustre-lite-utils, lustre-ldap nfs-utils-lustre
 Provides: lustre-lite = %{version}, lustre-lite-utils = %{version}
 Requires: %{name}-modules = %{version}
 BuildRequires: libtool
+%if %{with manpages}
+BuildRequires: python-docutils
+%endif
 %if %{with servers}
 Requires: lustre-osd
 Requires: lustre-osd-mount
@@ -196,7 +200,7 @@ backing store of a Lustre server.
 
 %if %{with lustre_utils}
 %package osd-zfs-mount
-Summary: osd-zfs-mount contains mount's ldiskfs specific dso.
+Summary: osd-zfs-mount contains mount's zfs specific dso.
 Provides: lustre-osd-mount
 Group: Development/Kernel
 
@@ -337,6 +341,7 @@ fi
 	%{!?with_servers:--disable-server} \
 	%{!?with_zfs:--without-zfs} \
 	%{!?with_lnet_dlc:--disable-dlc} \
+	%{!?with_manpages:--disable-manpages} \
 	--with-release=%{release} \
 	--with-linux=%{kdir} \
 	--with-linux-obj=%{kobjdir} \
@@ -442,6 +447,8 @@ find $RPM_BUILD_ROOT%{?rootdir}/lib/modules/%{kversion}/%{kmoddir} \
 %files -f lustre.files
 %defattr(-,root,root)
 %{_sbindir}/*
+%exclude %{_sbindir}/wirecheck
+%exclude %{_sbindir}/wiretest
 %if %{with zfs}
 %exclude %{_sbindir}/zfsobj2fid
 %endif
@@ -463,7 +470,9 @@ find $RPM_BUILD_ROOT%{?rootdir}/lib/modules/%{kversion}/%{kmoddir} \
 %{_libdir}/libcfsutil.a
 %{_libdir}/liblustreapi.a
 %{_libdir}/liblustreapi.so
+%if %{with manpages}
 %{_mandir}/man?/*
+%endif
 %{_includedir}/lustre
 %{_includedir}/libcfs
 %endif