r6331: libdat: build fixes

diff --git a/Makefile.am b/Makefile.am
index 405dca27aca75fe9efb2d61f64a8cc1753f7c94d..00eed1e42e9d6c57cb4316691c20aeeab445ee96 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -350,5 +350,5 @@ EXTRA_DIST = dat/common/dat_dictionary.h \
             dapl/udapl/libdaplscm.map \
             libdat.spec.in 
             
-dist-hook: libdat.spec 
-       cp libdat.spec $(distdir)
+dist-hook: libdat.spec LICENSE*.txt
+       cp libdat.spec LICENSE*.txt $(distdir)

diff --git a/configure.in b/configure.in
index bf5ec097628c5747d62b8f3ea8ffb4fa40d714b8..a5575c1499d69472ca8114c7d105dae4a9cf2a55 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, 1.2.0, dapl-devel@lists.sourceforge.net)
+AC_INIT(libdat, 1.2.0, dapl-devel@lists.sourceforge.net)
 AC_CONFIG_SRCDIR([dat/udat/udat.c])
 AC_CONFIG_AUX_DIR(config)
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(dapl, 1.2.0)
+AM_INIT_AUTOMAKE(libdat, 1.2.0)
 
 AM_PROG_LIBTOOL
 

diff --git a/libdat.spec.in b/libdat.spec.in
index 4cb1bdc508f283bf1102eedbe9f07075f385f235..78e6f33687be6556bcd834e60037eb72de7bb52c 100644 (file)
--- a/libdat.spec.in
+++ b/libdat.spec.in
@@ -36,7 +36,7 @@
 %define rel     %{?CUSTOM_RELEASE} %{!?CUSTOM_RELEASE:%RELEASE}
 
 Summary: Userspace DAT and DAPL API.
-Name: dapl
+Name: libdat
 Version: %ver
 Release: %rel
 License: Dual GPL/BSD/CPL
@@ -44,6 +44,7 @@ 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/
+BuildRequires: libibverbs-devel librdmacm-devel
 
 %description
 Along with the OpenIB kernel drivers, libdat and libdapl provides a userspace
@@ -52,7 +53,7 @@ RDMA API that supports DAT 1.2 specification
 %package devel
 Summary: Development files for the libdat and libdapl libraries
 Group: System Environment/Libraries
-Requires: %{name} = %{version}-%{release} 
+Requires: %{name} = %{version}-%{release}
 
 %description devel
 Static libraries and header files for the libdat and libdapl library.
@@ -78,8 +79,8 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root)
 %{_libdir}/libda*.so.*
-%{_sysconfdir}/dat.conf
-%doc AUTHORS COPYING ChangeLog NEWS README
+%config(noreplace) %{_sysconfdir}/dat.conf
+%doc AUTHORS COPYING README LICENSE*.txt
 
 %files devel
 %defattr(-,root,root,-)
@@ -95,4 +96,3 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/dat/udat.h
 %{_includedir}/dat/udat_redirection.h
 %{_includedir}/dat/udat_vendor_specific.h
-%{_sysconfdir}/dat.conf