X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre.spec.in;h=91f6d26b257a5847b0010335b0454d9d1894b7d7;hp=1af072b49fedfae9d519c59b96ca40f92787fcaf;hb=bcbcd5873589c71a5d1028c14e74f8897fc3ffc0;hpb=70b96b22d71b83c69fbf4b5cdc292f3ce40e4e17

diff --git a/lustre.spec.in b/lustre.spec.in
index 1af072b..91f6d26 100644
--- a/lustre.spec.in
+++ b/lustre.spec.in
@@ -10,6 +10,8 @@
 %bcond_without lustre_modules
 %bcond_with lnet_dlc
 %bcond_without manpages
+%bcond_without shared
+%bcond_without static
 
 %if %{without servers}
     # --without servers overrides --with {ldiskfs|zfs}
@@ -35,7 +37,7 @@
     %{!?myrelease: %global myrelease %(if [ -n "%downstream_release" ]; then echo -n "%{downstream_release}_"; fi; echo %kversion | tr '-' '_')}
     # 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/\.aarch64$//' -e 's/-default$//')
 %endif
 
 # always append the buildid, even when the caller defines %release
@@ -113,6 +115,7 @@ BuildRequires: python-docutils
 %if %{with servers}
 Requires: lustre-osd
 Requires: lustre-osd-mount
+Provides: lustre-client = %{version}-%{fullrelease}
 %endif
 %if %{defined cross_requires}
 Requires: %{cross_requires}
@@ -337,6 +340,8 @@ fi
 	%{?with_lustre_tests:--enable-tests}%{!?with_lustre_tests:--disable-tests} \
 	%{?with_lustre_utils:--enable-utils}%{!?with_lustre_utils:--disable-utils} \
 	%{?with_lustre_modules:--enable-modules}%{!?with_lustre_modules:--disable-modules} \
+	%{!?with_shared:--disable-shared} \
+	%{!?with_static:--disable-static} \
 	%{!?with_lustre_iokit:--disable-iokit} \
 	%{!?with_ldiskfs:--disable-ldiskfs} \
 	%{!?with_servers:--disable-server} \
@@ -371,6 +376,7 @@ echo '%{_sysconfdir}/sysconfig/lustre' >>lustre.files
 echo '%{_sysconfdir}/init.d/lustre' >>lustre.files
 %endif
 echo '%{_sysconfdir}/init.d/lnet' >>lustre.files
+echo '%{_sysconfdir}/init.d/lsvcgss' >>lustre.files
 %endif
 
 # Create the pristine source directory.
@@ -384,8 +390,14 @@ chmod -R go-w lustre-source/lustre-%{version}
 find $RPM_BUILD_ROOT -name \*.so -type f -exec chmod +x {} \;
 
 %if %{with lnet_dlc}
+rm -f $RPM_BUILD_ROOT%{_libdir}/liblnetconfig.la
+%if %{with static}
 echo '%attr(-, root, root) %{_libdir}/liblnetconfig.a' >>lustre.files
+%endif
+%if %{with shared}
 echo '%attr(-, root, root) %{_libdir}/liblnetconfig.so' >>lustre.files
+echo '%attr(-, root, root) %{_libdir}/liblnetconfig.so.*' >>lustre.files
+%endif
 %endif
 
 %if %{with ldiskfs}
@@ -394,7 +406,6 @@ echo '%{_libdir}/libiam.a' >>lustre.files
 
 if [ -d $RPM_BUILD_ROOT%{_libdir}/lustre/snmp ] ; then
 	echo '%{_libdir}/lustre/snmp' >>lustre.files
-	echo '%{_datadir}/lustre/snmp/mibs' >>lustre.files
 fi
 
 find $RPM_BUILD_ROOT%{_libdir}/@PACKAGE@ \