X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre.spec.in;h=ef29b672a6faa21a1e0d5a377ac2e8f85263a051;hp=24f18f038f685bb0cb54d03503e18f82454bb28e;hb=15d44e787e17ff57fc1fb5a6c9ae568cdaab6e34;hpb=7cdc4b709a2147fa98a9bb56ff06a1dfcaa434a5

diff --git a/lustre.spec.in b/lustre.spec.in
index 24f18f0..ef29b67 100644
--- a/lustre.spec.in
+++ b/lustre.spec.in
@@ -57,6 +57,13 @@
 %{!?kdir:    %global kdir    /lib/modules/%{_kver}/source}
 %{!?kobjdir: %global kobjdir %(if [ "%{kdir}" = "/lib/modules/%{_kver}/source" ]; then echo "/lib/modules/%{_kver}/build"; else echo "%{kdir}"; fi)}
 
+
+%if 0%{?suse_version} >= 1310
+	%define _flavor %(basename %{kobjdir})
+%else
+	%define _flavor default
+%endif
+
 %if %{defined _take_kver}
 # as an alternative to this implementation we could simply "make -C $kdir kernelversion"
 %global kver %(files="include/generated/utsrelease.h include/linux/utsrelease.h include/linux/version.h"; for f in $files; do if test -r %{kobjdir}/$f && grep UTS_RELEASE %{kobjdir}/$f >/dev/null; then sed -ne '/^#define UTS_RELEASE/s/.*"\\(.*\\)"$/\\1/p' %{kobjdir}/$f; break; fi; done)
@@ -115,7 +122,7 @@
 
 %global modules_fs_path /lib/modules/%{_kver}/%{kmoddir}
 # requires want to set a version including epoch
-%global krequires %(echo %{kver} | 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$//')
+%global krequires %(echo %{kver} | 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$//' -e s/%{_flavor}//)
 
 %if %{_vendor}=="redhat" || %{_vendor}=="fedora"
 	%global requires_kmod_name kmod-%{lustre_name}
@@ -191,6 +198,9 @@ BuildRequires: pkgconfig
 %else
 BuildRequires: pkg-config
 %endif
+%if %{with gss}
+BuildRequires: krb5-devel openssl-devel
+%endif
 %if %{with servers}
 Requires: lustre-osd
 Requires: lustre-osd-mount
@@ -199,8 +209,6 @@ Provides: lustre-server = %{version}-%{release}
 %endif
 Obsoletes: lustre-client < %{version}
 Provides: lustre-client = %{version}-%{release}
-
-# GSS requires this: BuildRequires: libgssapi-devel >= 0.10
 %if %{_vendor}=="redhat" || %{_vendor}=="fedora"
 #suse don't support selinux
 BuildRequires: libselinux-devel
@@ -258,10 +266,10 @@ echo $TMPFILE
 %else
 %define preamble %{SOURCE1}
 %endif
-%kernel_module_package -n %{name} -p %preamble -f %SOURCE2 default
+%kernel_module_package -n %{name} -p %preamble -f %SOURCE2 %{_flavor}
 
 %if %{with ldiskfs}
-%kernel_module_package -n %{name}-osd-ldiskfs -p %SOURCE3 -f %SOURCE4 default
+%kernel_module_package -n %{name}-osd-ldiskfs -p %SOURCE3 -f %SOURCE4 %{_flavor}
 %if %{with lustre_utils}
 %package osd-ldiskfs-mount
 Summary: osd-ldiskfs-mount contains mount's ldiskfs specific dso.
@@ -278,7 +286,7 @@ LDISKFS hooks for mount/mkfs into a dynamic library.
 %endif	# with ldiskfs
 
 %if %{with zfs}
-%kernel_module_package -n %{name}-osd-zfs -p %SOURCE5 -f %SOURCE6 default
+%kernel_module_package -n %{name}-osd-zfs -p %SOURCE5 -f %SOURCE6 %{_flavor}
 %if %{with lustre_utils}
 %package osd-zfs-mount
 Summary: osd-zfs-mount contains mount's zfs specific dso.
@@ -309,6 +317,22 @@ A set of scripts to operate Lustre resources in a High Availablity
 environment for both Pacemaker and rgmanager.
 %endif
 
+%package devel
+Summary: Lustre include headers
+Group: Development/Kernel
+Provides: lustre-devel = %{version}
+Requires: %{lustre_name} = %{version}
+Requires: %{requires_kmod_name} = %{requires_kmod_version}
+
+%description devel
+This package contains the header files needed for building additional
+applications against the Lustre / LNet utilities libraries.
+
+:> lustre-devel.files
+%if %{with lustre_modules}
+find . -type f -name '*.h' | grep uapi | sed 's/.*uapi\//usr\/include\//' >> lustre-devel.files
+%endif
+
 %if %{with lustre_tests}
 %package tests
 Summary: Lustre testing framework
@@ -317,12 +341,12 @@ Provides: lustre-tests = %{version}
 %if %{with lustre_iokit}
 Requires: lustre-iokit
 %endif
-Requires: lustre-client = %{version}
+Requires: lustre-devel = %{version}
 %if %{with lustre_modules}
 Requires: %{requires_kmod_name} = %{requires_kmod_version}
 Requires: %{requires_kmod_tests_name} = %{requires_kmod_version}
 %endif
-Requires: attr, rsync, perl, lsof, libtool, /usr/bin/getconf
+Requires: attr, rsync, perl, lsof, /usr/bin/getconf
 %if %{with mpi}
 %if %{mpi_name} == "mpich"
 BuildRequires: mpich-devel
@@ -341,7 +365,7 @@ This package contains a set of test binaries and scripts that are intended
 to be used by the Lustre testing framework.
 
 %if %{with lustre_modules}
-%kernel_module_package -n %{name}-tests -f %SOURCE7 default
+%kernel_module_package -n %{name}-tests -f %SOURCE7 %{_flavor}
 %endif
 %endif
 
@@ -458,6 +482,13 @@ fi
 	--with-linux-obj=%{kobjdir} \
 	--with-kmp-moddir=%{kmoddir}/%{name}
 
+%if %{with servers}
+if ! grep -q define[[:space:]]*HAVE_SERVER_SUPPORT config.h 2> /dev/null; then
+	echo "Error: Server Support configured but not found"
+	false
+fi
+%endif
+
 make %{?_smp_mflags} -s %{?make_args}
 
 %install
@@ -535,7 +566,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/liblnetconfig.la
 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-devel.files
 echo '%attr(-, root, root) %{_libdir}/liblnetconfig.so.*' >>lustre.files
 %endif
 
@@ -575,6 +606,19 @@ if [ -n "$MPI_BIN" ]; then
 fi
 %endif
 
+%files devel -f lustre-devel.files
+%defattr(-,root,root)
+%{_libdir}/pkgconfig/lustre.pc
+%if %{with static}
+%{_libdir}/liblustreapi.a
+%endif
+%if %{with shared}
+%{_libdir}/liblustreapi.so
+%endif
+%{_includedir}/lustre
+%{_includedir}/linux/lnet
+%{_includedir}/linux/lustre
+
 %files -f lustre.files
 %defattr(-,root,root)
 %{_sbindir}/*
@@ -608,15 +652,9 @@ fi
 %{_mandir}/man?/*
 %endif
 
-%if %{with static}
-%{_libdir}/liblustreapi.a
-%endif
 %if %{with shared}
-%{_libdir}/liblustreapi.so*
+%{_libdir}/liblustreapi.so.*
 %endif
-%{_includedir}/lustre
-%{_includedir}/linux/lnet
-%{_includedir}/linux/lustre
 %{_sysconfdir}/udev/rules.d/99-lustre.rules
 %if %{with servers}
 %{_sysconfdir}/udev/rules.d/99-lustre-server.rules