Release dapl-2.0.39.1-1

Signed-off-by: Arlin Davis <arlin.r.davis@intel.com>

diff --git a/ChangeLog b/ChangeLog
index e323369b5b2047f343d2bbbac6298d3b67dfa93f..60b7690c3e11a498627262394eacd14ebcd26bc7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+commit 38383c801097b29205665d46e9a02d28d7139a2b
+Author: pmmccorm <patrick.m.mccormick@intel.com>
+Date:   Fri Nov 22 12:31:34 2013 -0800
+
+    Rename back to dapl, small fixes for spec file
+
+commit de443057a72a691ec136735f215fd83d0322bfab
+Author: Arlin Davis <arlin.r.davis@intel.com>
+Date:   Wed Sep 25 15:14:19 2013 -0700
+
+    Release intel-mic-ofed-dapl-2.0.36.12-1
+    
+    Signed-off-by: Arlin Davis <arlin.r.davis@intel.com>
+
 commit 66ab1ab6ffd7c8b95f1b16ae45cb58b7ccd07bd5
 Author: Arlin Davis <arlin.r.davis@intel.com>
 Date:   Wed Sep 25 15:10:56 2013 -0700

diff --git a/configure.in b/configure.in
index c1a4ce6ed1fdd54cd3076d0f7a49b24bfeb1b547..9cebcc9d40f51879797deef26decb96454e3baed 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,12 +1,12 @@
 dnl Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.57)
-AC_INIT(dapl, 2.0.36.12, linux-rdma@vger.kernel.org)
+AC_INIT(dapl, 2.0.39.1, linux-rdma@vger.kernel.org)
 AC_CONFIG_SRCDIR([dat/udat/udat.c])
 AC_CONFIG_AUX_DIR(config)
 AC_CONFIG_MACRO_DIR([m4])
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(dapl, 2.0.36.12)
+AM_INIT_AUTOMAKE(dapl, 2.0.39.1)
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
 AM_PROG_LIBTOOL

diff --git a/dapl.spec.in b/dapl.spec.in
index cc6782d0f498cec51e3bd5f87fc9ad301c21acf9..c6276dd8b46c8ebd05a8520040db88f9a77a63fa 100644 (file)
--- a/dapl.spec.in
+++ b/dapl.spec.in
@@ -1,5 +1,5 @@
 # Copyright (c) 2002-2005, Network Appliance, Inc. All rights reserved.
-# Copyright (c) 2007, Intel Corporation. All rights reserved.
+# Copyright (c) 2007-2013, Intel Corporation. All rights reserved.
 #
 # This Software is licensed under one of the following licenses:
 #
@@ -40,7 +40,7 @@
 %define debug_package %{nil}
 
 Name: dapl
-Version: 2.0.36.12
+Version: 2.0.39.1
 Release: 1%{?dist}
 Summary: A Library for userspace access to RDMA devices using OS Agnostic DAT APIs, proxy daemon for offloading RDMA 
 
@@ -51,6 +51,7 @@ Source: http://www.openfabrics.org/downloads/%{name}/%{name}-%{version}.tar.gz
 BuildRoot: %{_topdir}/BUILDROOT
 Obsoletes: dapl
 Conflicts: dapl
+Obsoletes: intel-mic-ofed-dapl
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 Requires(post): /sbin/chkconfig
@@ -67,6 +68,7 @@ Group: System Environment/Libraries
 Requires: %{name} = %{version}-%{release}
 Obsoletes: dapl-devel
 Conflicts: dapl-devel
+Obsoletes: intel-mic-ofed-dapl-devel
 
 %description devel
 Header files for libdat and libdapl library.
@@ -75,6 +77,7 @@ Header files for libdat and libdapl library.
 Summary: Static development files for libdat and libdapl library
 Group: System Environment/Libraries
 Obsoletes: dapl-devel-static
+Obsoletes: intel-mic-ofed-dapl-devel-static
 Conflicts: dapl-devel-static
  
 %description devel-static
@@ -86,6 +89,7 @@ Group: System Environment/Libraries
 Requires: %{name} = %{version}-%{release}
 Obsoletes: dapl-utils
 Conflicts: dapl-utils
+Obsoletes: intel-mic-ofed-dapl-utils
 
 %description utils
 Useful test suites to validate uDAPL library API's.
@@ -159,6 +163,9 @@ service mpxyd stop
 mv /tmp/%{version}-dat.conf %{_sysconfdir}/dat.conf
 
 %changelog
+* Wed Dec 4 2013 Arlin Davis <ardavis@intel.com> - 2.0.39.1
+- DAT/DAPL Version 2.0.39.1 Release 1, OFED 3.5-MIC, Intel MPSS 3.2
+
 * Wed Sep 25 2013 Arlin Davis <ardavis@intel.com> - 2.0.36.12
 - DAT/DAPL Version 2.0.36.12 Release 1, OFED 3.5-MIC, Intel MPSS 3.1