RDMA/libocrdma: Updating the spec file based on review

Spec file cleanup. Also, fixed the logic to generate the dapl version
used in /etc/dat.conf

Signed-off-by: Selvin Xavier <selvin.xavier@broadcom.com>

diff --git a/libocrdma.spec.in b/libocrdma.spec.in
index ab9eb0c64a34c10cc94baf86c1216e2e8f62f331..5f7d9f13c52780495e3ca1bcb9109065759e2ee0 100644 (file)
--- a/libocrdma.spec.in
+++ b/libocrdma.spec.in
@@ -1,18 +1,18 @@
 Name: libocrdma
 Version: @VERSION@
 Release: 1%{?dist}
-Summary: Userspace Library for Emulex ROCEE Device.
+Summary: User-space Library for Emulex ROCE Device
 Group: System Environment/Libraries
-License: GPL/BSD
-Url: http://www.openfabrics.org/
-Source: http://www.openfabrics.org/downloads/ocrdma/%{name}-%{version}.tar.gz
+License: GPLv2 or BSD
+Url: https://www.openfabrics.org/
+Source: http://www.openfabrics.org/downloads/%{name}/%{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: libibverbs-devel
 
 %description
-libocrdma provides a device-specific userspace driver for Emulex One Command RoCE Adapters
-for use with the libibverbs library.
+libocrdma provides a device-specific user-space driver for Emulex
+One Command RoCE Adapters for use with the libibverbs library.
 
 %package devel
 Summary: Development files for the libocrdma driver
@@ -31,17 +31,18 @@ application, which may be useful for debugging.
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-%makeinstall
+make DESTDIR=%{buildroot} install
 # remove unpackaged files from the buildroot
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.la $RPM_BUILD_ROOT%{_libdir}/libocrdma.so
 
 %post
 /sbin/ldconfig
 if [ -e %{_sysconfdir}/dat.conf ]; then
-    sed -e '/ofa-v2-scm-roe-ocrdma.* u2/d' < %{_sysconfdir}/dat.conf > /tmp/$$ofadapl
-    mv /tmp/$$ofadapl %{_sysconfdir}/dat.conf
-    dapl_ver=`rpm -q dapl|cut -c6-8`
+    sed -e '/ofa-v2-scm-roe-ocrdma.* u2/d' -i %{_sysconfdir}/dat.conf
+    dapl_ver=`find %{_libdir} \! -type l|grep libdat2.so|awk -F'libdat2.so.' '{print $2}'|cut -c1-3|head -1`
+    if [ "${dapl_ver}" = "" ]; then
+        dapl_ver="2.0"
+    fi
     echo ofa-v2-scm-roe-ocrdma0-1 u${dapl_ver} nonthreadsafe default libdaploscm.so.2 dapl.${dapl_ver} '"ocrdma0 1" ""' >> %{_sysconfdir}/dat.conf
     echo ofa-v2-scm-roe-ocrdma1-1 u${dapl_ver} nonthreadsafe default libdaploscm.so.2 dapl.${dapl_ver} '"ocrdma1 1" ""' >> %{_sysconfdir}/dat.conf
     echo ofa-v2-scm-roe-ocrdma2-1 u${dapl_ver} nonthreadsafe default libdaploscm.so.2 dapl.${dapl_ver} '"ocrdma2 1" ""' >> %{_sysconfdir}/dat.conf
@@ -51,8 +52,7 @@ fi
 %postun
 /sbin/ldconfig
 if [ -e %{_sysconfdir}/dat.conf ]; then
-    sed -e '/ofa-v2-scm-roe-ocrdma.* u2/d' < %{_sysconfdir}/dat.conf > /tmp/$$ofadapl
-    mv /tmp/$$ofadapl %{_sysconfdir}/dat.conf
+    sed -e '/ofa-v2-scm-roe-ocrdma.* u2/d' -i %{_sysconfdir}/dat.conf
 fi
 
 %clean
@@ -60,9 +60,9 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%{_libdir}/libocrdma*.so
-# %doc AUTHORS COPYING ChangeLog README
-%config %{_sysconfdir}/libibverbs.d/ocrdma.driver
+%{_libdir}/libocrdma-rdmav2.so
+%doc AUTHORS README COPYING
+%{_sysconfdir}/libibverbs.d/ocrdma.driver
 
 %files devel
 %defattr(-,root,root,-)