Final changes for 2.0.1-1 package, OFED 1.3 ALPHA

Fix build issue with SLES 10, gcc++ compiler

 Signed-off-by: Jimmy Hill <jimmy.hill@us.ibm.com>
 Signed-off-by: Arlin Davis <ardavis@ichips.intel.com>

diff --git a/configure.in b/configure.in
index 3a06640a39d652da56001752b2e234f1ccd2b331..b08e06f42d1001f1ecdaca676fba9ef691367629 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,11 +1,11 @@
 dnl Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.57)
-AC_INIT(dapl, 2.0.1-pre, general@lists.openfabrics.org)
+AC_INIT(dapl, 2.0.1-1, general@lists.openfabrics.org)
 AC_CONFIG_SRCDIR([dat/udat/udat.c])
 AC_CONFIG_AUX_DIR(config)
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(dapl, 2.0.1-pre)
+AM_INIT_AUTOMAKE(dapl, 2.0.1-1)
 
 AM_PROG_LIBTOOL
 

diff --git a/dapl.spec.in b/dapl.spec.in
index b1986e9f1ed0702736e3b086121c5270223b9f41..232f0df331a426271b7bc43a35bc427a61e85ce7 100644 (file)
--- a/dapl.spec.in
+++ b/dapl.spec.in
@@ -31,21 +31,18 @@
 # uDAT and uDAPL 2.0 Registry RPM SPEC file
 #
 # $Id: $
+Name: dapl
+Version: 2.0.1
+Release: 1%{?dist}
+Summary: A Library for userspace access to RDMA devices using OS Agnostic DAT APIs.
 
-%define ver 2.0
-%define RELEASE 1 
-%define rel     %{?CUSTOM_RELEASE} %{!?CUSTOM_RELEASE:%RELEASE}
-
-Summary: Userspace DAT and DAPL 2.0 API.
-Name: dapl2
-Version: %ver
-Release: %rel%{?dist}
-
-License: Dual GPL/BSD/CPL
 Group: System Environment/Libraries
-BuildRoot: %{_tmppath}/%{name}-%{version}.%{release}-root-%(%{__id_u} -n)
-Source: http://www.openfabrics.org/downloads/%{name}/%{name}-%{version}.%{release}.tar.gz
+License: Dual GPL/BSD/CPL
 Url: http://openfabrics.org/
+Source: http://www.openfabrics.org/downloads/%{name}/%{name}-%{version}-%{release}.tar.gz
+BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
 
 %description
 Along with the OpenFabrics kernel drivers, libdat and libdapl provides a userspace
@@ -55,10 +52,16 @@ atomic operations and rdma write with immediate data.
 %package devel
 Summary: Development files for the libdat and libdapl libraries
 Group: System Environment/Libraries
-Requires: %{name} = %{version}-%{release} 
 
 %description devel
-Static libraries and header files for the libdat and libdapl library.
+Header files for libdat and libdapl library.
+
+%package devel-static
+Summary: Static development files for libdat and libdapl library
+Group: System Environment/Libraries
+ 
+%description devel-static
+Static libraries for libdat and libdapl library.
 
 %package utils
 Summary: Test suites for uDAPL library
@@ -69,42 +72,47 @@ Requires: %{name} = %{version}-%{release}
 Useful test suites to validate uDAPL library API's.
 
 %prep
-%setup -q -n %{name}-%{version}.%{release}
+%setup -q -n %{name}-@VERSION@
 
 %build
-%configure 
-make
+%configure --enable-ext-type=ib 
+make %{?_smp_mflags}
 
 %install
-make DESTDIR=${RPM_BUILD_ROOT} install
+rm -rf %{buildroot}
+make DESTDIR=%{buildroot} install
 # remove unpackaged files from the buildroot
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+rm -f %{buildroot}%{_libdir}/*.la
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
 %files
-%defattr(-,root,root)
-%{_libdir}/libda*.so*
+%defattr(-,root,root,-)
+%{_libdir}/libda*.so.*
 %config(noreplace) %{_sysconfdir}/dat.conf
 %doc AUTHORS README
 
 %files devel
-%defattr(-,root,root)
-%{_libdir}/*.a
+%defattr(-,root,root,-)
+%{_libdir}/*.so
 %{_includedir}/dat2/*
 
+%files devel-static
+%defattr(-,root,root,-)
+%{_libdir}/*.a
+
 %files utils
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %{_bindir}/*
 %{_mandir}/man1/*
 
 %changelog
-* Tue Sep 18 2007 Arlin Davis <ardavis@ichips.intel.com> - 2.0.1.pre
-- Coexist with DAT 1.2 libraries, library name changes libdat2, etc.  
+* Tue Sep 18 2007 Arlin Davis <ardavis@ichips.intel.com> - 2.0.1-1
+- OFED 1.3-alpha, co-exist with DAT 1.2 library package.  
 
 * Wed Mar 7 2007 Arlin Davis <ardavis@ichips.intel.com> - 2.0.0.pre
 - Initial release of DAT 2.0 APIs, includes IB extensions 

diff --git a/dat/include/dat/udat.h b/dat/include/dat/udat.h
index 4c140f3d4116c8d6fd5a7aece29fec1ec32b1a39..7a89241be310d6b4a4bcc9c9c7b1a4fdb6bd7c75 100755 (executable)
--- a/dat/include/dat/udat.h
+++ b/dat/include/dat/udat.h
@@ -117,6 +117,23 @@ typedef enum dat_evd_param_mask
 
 typedef DAT_UINT64 DAT_PROVIDER_ATTR_MASK;
 
+enum  dat_lmr_param_mask
+{
+       DAT_LMR_FIELD_IA_HANDLE          = 0x001,
+       DAT_LMR_FIELD_MEM_TYPE           = 0x002,
+       DAT_LMR_FIELD_REGION_DESC        = 0x004,
+       DAT_LMR_FIELD_LENGTH             = 0x008,
+       DAT_LMR_FIELD_PZ_HANDLE          = 0x010,
+       DAT_LMR_FIELD_MEM_PRIV           = 0x020,
+       DAT_LMR_FIELD_VA_TYPE            = 0x040,
+       DAT_LMR_FIELD_LMR_CONTEXT        = 0x080,
+       DAT_LMR_FIELD_RMR_CONTEXT        = 0x100,
+       DAT_LMR_FIELD_REGISTERED_SIZE    = 0x200,
+       DAT_LMR_FIELD_REGISTERED_ADDRESS = 0x400,
+
+       DAT_LMR_FIELD_ALL                = 0x7FF
+};
+
 #include <dat/dat.h>
 
 typedef DAT_HANDLE      DAT_CNO_HANDLE;
@@ -215,23 +232,6 @@ struct dat_lmr_param
     DAT_VADDR                   registered_address;
 };
 
-enum  dat_lmr_param_mask
-{
-       DAT_LMR_FIELD_IA_HANDLE          = 0x001,
-       DAT_LMR_FIELD_MEM_TYPE           = 0x002,
-       DAT_LMR_FIELD_REGION_DESC        = 0x004,
-       DAT_LMR_FIELD_LENGTH             = 0x008,
-       DAT_LMR_FIELD_PZ_HANDLE          = 0x010,
-       DAT_LMR_FIELD_MEM_PRIV           = 0x020,
-       DAT_LMR_FIELD_VA_TYPE            = 0x040,
-       DAT_LMR_FIELD_LMR_CONTEXT        = 0x080,
-       DAT_LMR_FIELD_RMR_CONTEXT        = 0x100,
-       DAT_LMR_FIELD_REGISTERED_SIZE    = 0x200,
-       DAT_LMR_FIELD_REGISTERED_ADDRESS = 0x400,
-
-       DAT_LMR_FIELD_ALL                = 0x7FF
-};
-
 typedef enum dat_proxy_type
 {
        DAT_PROXY_TYPE_NONE     = 0x0,