X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre.spec.in;h=1cd2ddd82e6be692afbe98ff9046570746b04a39;hp=36f7d463092ca402fb953a8ed9ca8f27caaae44c;hb=62499626b81f83f9e2ceceaa11d9b33861581cb6;hpb=6c89ca144ac7329aa08c870edf6e163a2e0b6d45 diff --git a/lustre.spec.in b/lustre.spec.in index 36f7d46..1cd2ddd 100644 --- a/lustre.spec.in +++ b/lustre.spec.in @@ -9,7 +9,7 @@ Release: @RELEASE@ License: GPL Group: Utilities/System Source: lustre-%{version}.tar.gz -URL: http://clusterfs.com/ +URL: http://www.sun.com/software/products/lustre/index.xml BuildRoot: %{_tmppath}/lustre-%{version}-root Obsoletes: lustre-lite, lustre-lite-utils, lustre-ldap nfs-utils-lustre Provides: lustre-lite = %{version}, lustre-lite-utils = %{version} @@ -72,7 +72,7 @@ systems. Summary: Lustre testing framework Group: Development/Kernel Provides: lustre-tests = %{version} -Requires: lustre = %{version} +Requires: lustre = %{version}, lustre-modules = %{version} %description tests This package contains a set of test binaries and scripts that are intended @@ -124,6 +124,7 @@ mkdir -p $RPM_BUILD_ROOT/usr/src rm -f lustre-source ln -s $RPM_BUILD_ROOT/usr/src lustre-source make distdir distdir=lustre-source/lustre-%{version} +chmod -R go-w lustre-source/lustre-%{version} cat >lustre.files <lustre.files <>lustre.files +fi + if [ -f $RPM_BUILD_ROOT%{_libdir}/liblustre.so ] ; then echo '%attr(-, root, root) %{_libdir}/liblustre.a' >>lustre.files echo '%attr(-, root, root) %{_libdir}/liblustre.so' >>lustre.files @@ -157,12 +162,15 @@ fi # Have universal lustre headers if [ -f $RPM_BUILD_DIR/lustre-%{version}/lustre/include/lustre/lustre_idl.h ] ; then - echo '%attr(-, root, root) /usr/include/linux/lustre_types.h' >>lustre.files echo '%attr(-, root, root) /usr/include/linux/lustre_user.h' >>lustre.files else echo '%attr(-, root, root) /usr/include/linux/lustre_idl.h' >>lustre.files fi +if [ -f $RPM_BUILD_DIR/lustre-%{version}/lustre/include/linux/lustre_types.h ] ; then + echo '%attr(-, root, root) /usr/include/linux/lustre_types.h' >>lustre.files +fi + echo '%attr(-, root, root) %{_libdir}/lustre/tests/*' >lustre-tests.files echo '%attr(-, root, root) /lib/modules/%{kversion}/kernel/fs/lustre/llog_test.*' >>lustre-tests.files modules_excludes="llog_test" @@ -194,6 +202,13 @@ if [ -f /boot/System.map-%{kversion} ]; then else depmod -ae %{kversion} || exit 0 fi +cat <