- Fix bug 408, dapltest compilation failure on 32 bit arch

- Update libdat.spec.in file to build uDAPL RPMs correctly

diff --git a/libdat.spec.in b/libdat.spec.in
index 4cb1bdc508f283bf1102eedbe9f07075f385f235..bcd78ad5df5b93fb0fd4f2bffdc030837e647de3 100644 (file)
--- a/libdat.spec.in
+++ b/libdat.spec.in
@@ -31,19 +31,20 @@
 #
 # $Id: $
 
-%define ver      1.2.0
-%define RELEASE 1.2
+%define ver 1.2.1
+%define RELEASE pre 
 %define rel     %{?CUSTOM_RELEASE} %{!?CUSTOM_RELEASE:%RELEASE}
 
 Summary: Userspace DAT and DAPL API.
 Name: dapl
 Version: %ver
-Release: %rel
+Release: %rel%{?dist}
+
 License: Dual GPL/BSD/CPL
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Source: http://openib.org/downloads/%{name}-%{version}.tar.gz
-Url: http://openib.org/
+Source: http://openfabrics.org/~ardavis/%{name}-%{version}-%{release}.tgz
+Url: http://openfabrics.org/
 
 %description
 Along with the OpenIB kernel drivers, libdat and libdapl provides a userspace
@@ -57,10 +58,19 @@ Requires: %{name} = %{version}-%{release}
 %description devel
 Static libraries and header files for the libdat and libdapl library.
 
+%package utils
+Summary: Test suites for uDAPL library
+Group: System Environment/Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description utils
+Useful test suites to validate uDAPL library API's.
+
 %prep
-%setup -q -n %{name}-%{ver}
+%setup -q -n %{name}
 
 %build
+./autogen.sh
 %configure
 make
 
@@ -79,7 +89,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root)
 %{_libdir}/libda*.so.*
 %{_sysconfdir}/dat.conf
-%doc AUTHORS COPYING ChangeLog NEWS README
+%doc AUTHORS README
 
 %files devel
 %defattr(-,root,root,-)
@@ -96,3 +106,18 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/dat/udat_redirection.h
 %{_includedir}/dat/udat_vendor_specific.h
 %{_sysconfdir}/dat.conf
+
+%files utils
+%defattr(-,root,root,-)
+%{_bindir}/*
+%{_mandir}/man1/*
+
+%changelog
+* Wed Mar 7 2007 Arlin Davis <ardavis@ichips.intel.com> - 1.2.1.pre
+- OFED 1.2-alpha, added dtest and dapltest utilies to package
+
+* Fri Oct 20 2006 Arlin Davis <ardavis@ichips.intel.com> - 1.2.0
+- OFED 1.1, 
+
+* Wed May 31 2006 Arlin Davis <ardavis@ichips.intel.com> - 1.2.0
+- OFED 1.0 

diff --git a/test/dapltest/mdep/linux/dapl_mdep_user.h b/test/dapltest/mdep/linux/dapl_mdep_user.h
index c05dd30b59bf5d0a1973878081ef9610f9e606e4..2903e787fb659d3bdc5f9fac9d58098a6205704e 100644 (file)
--- a/test/dapltest/mdep/linux/dapl_mdep_user.h
+++ b/test/dapltest/mdep/linux/dapl_mdep_user.h
@@ -117,7 +117,7 @@ typedef unsigned long long int              DT_Mdep_TimeStamp;
 static _INLINE_ DT_Mdep_TimeStamp
 DT_Mdep_GetTimeStamp ( void )
 {
-#if defined(__GNUC__) && defined(__PENTIUM__)
+#if defined(__GNUC__) && defined(__i386__)
     DT_Mdep_TimeStamp x;
     __asm__ volatile (".byte 0x0f, 0x31" : "=A" (x));
     return x;
@@ -143,7 +143,7 @@ DT_Mdep_GetTimeStamp ( void )
       asm volatile("rdtsc" : "=a" (__a), "=d" (__d)); 
       return ((unsigned long)__a) | (((unsigned long)__d)<<32);
 #else
-#error "Non-Pentium and Non-PPC Linux - unimplemented"
+#error "Linux CPU architecture - unimplemented"
 #endif
 #endif
 #endif