repair

diff --git a/meta b/meta
index d4751788f259c23f3a9f464337d034e61422b930..e43f17af39b134ff14e61a1c45ce4aad2e36c3eb 100644 (file)
--- a/meta
+++ b/meta
@@ -1,8 +1,9 @@
 Version: 1
-Previous: 914f530875285661f173dce5326beb90f6697772
+Previous: 8337506569a9d9fb1f634e6134cf8194a3bce6d4
 Head: de4c3bcb9875281c22a667856847d7a5e5546f9d
 Applied:
   ibacm-release-1-0-0: 558a3025fe8efdfea143c1e54ac3033db1f7a347
   notes: b222226996fcdc7452b199b5ca4e09894adbc4ac
+  ibacm-fixup-package-name-and-i: de4c3bcb9875281c22a667856847d7a5e5546f9d
 Unapplied:
 Hidden:

diff --git a/patches/ibacm-fixup-package-name-and-i b/patches/ibacm-fixup-package-name-and-i
new file mode 100644 (file)
index 0000000..0e17017
--- /dev/null
+++ b/patches/ibacm-fixup-package-name-and-i
@@ -0,0 +1,94 @@
+Bottom: 087d6d362bd4701b1c1d2e3b02fbb873888cbf80
+Top:    daa73408825627cbc7a8b403b0cfab48dd1e187a
+Author: Sean Hefty <sean.hefty@intel.com>
+Date:   2010-06-21 09:08:39 -0700
+
+ibacm: fixup package name and installation for inclusion into OFED
+
+Signed-off-by: Sean Hefty <sean.hefty@intel.com>
+
+
+---
+
+diff --git a/Makefile.am b/Makefile.am
+index 46f68d4..b0d5fff 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -8,9 +8,9 @@ util_ib_acme_SOURCES = src/acme.c linux/acme_linux.c src/libacm.c linux/libacm_l
+ svc_ib_acm_CFLAGS = $(AM_CFLAGS)
+ util_ib_acme_CFLAGS = $(AM_CFLAGS)
+ 
+-ib_acmincludedir = $(includedir)/infiniband
++ibacmincludedir = $(includedir)/infiniband
+ 
+-ib_acminclude_HEADERS = include/infiniband/acm.h
++ibacminclude_HEADERS = include/infiniband/acm.h
+ 
+ man_MANS = \
+       man/ib_acme.1 \
+diff --git a/acm_notes.txt b/acm_notes.txt
+index bf38961..2bd7afb 100644
+--- a/acm_notes.txt
++++ b/acm_notes.txt
+@@ -23,7 +23,7 @@ implementation limits network traffic, SA interactions, and centralized
+ services.  ACM supports multiple resolution protocols in order to handle\r
+ different fabric topologies.\r
+ \r
+-This release 1.0.0 is limited in its handling of dynamic changes.\r
++This release 1.0.1 is limited in its handling of dynamic changes.\r
+ \r
+ The IB ACM package is comprised of two components: the ib_acm service\r
+ and a test/configuration utility - ib_acme.  Both are userspace components\r
+diff --git a/configure.in b/configure.in
+index 9311602..71b3eb5 100644
+--- a/configure.in
++++ b/configure.in
+@@ -1,11 +1,11 @@
+ dnl Process this file with autoconf to produce a configure script.\r
+ \r
+ AC_PREREQ(2.57)\r
+-AC_INIT(ib_acm, 1.0.0, linux-rdma@vger.kernel.org)\r
++AC_INIT(ibacm, 1.0.1, linux-rdma@vger.kernel.org)\r
+ AC_CONFIG_SRCDIR([src/acm.c])\r
+ AC_CONFIG_AUX_DIR(config)\r
+ AM_CONFIG_HEADER(config.h)\r
+-AM_INIT_AUTOMAKE(ib_acm, 1.0.0)\r
++AM_INIT_AUTOMAKE(ibacm, 1.0.1)\r
+ \r
+ AM_PROG_LIBTOOL\r
+ \r
+@@ -25,9 +25,9 @@ AC_CHECK_SIZEOF(long)
+ dnl Checks for libraries\r
+ if test "$disable_libcheck" != "yes"; then\r
+ AC_CHECK_LIB(ibverbs, ibv_get_device_list, [],\r
+-    AC_MSG_ERROR([ibv_get_device_list() not found.  ib_acm requires libibverbs.]))\r
++    AC_MSG_ERROR([ibv_get_device_list() not found.  ibacm requires libibverbs.]))\r
+ AC_CHECK_LIB(ibumad, umad_send, [],\r
+-    AC_MSG_ERROR([umad_send() not found.  ib_acm requires libibumad.]))\r
++    AC_MSG_ERROR([umad_send() not found.  ibacm requires libibumad.]))\r
+ fi\r
+ \r
+ dnl Checks for header files.\r
+diff --git a/ibacm.spec.in b/ibacm.spec.in
+index 2c10e1c..9eabeb0 100644
+--- a/ibacm.spec.in
++++ b/ibacm.spec.in
+@@ -1,7 +1,7 @@
+ %define ver @VERSION@
+ 
+-Name: ib_acm
+-Version: 1.0.0
++Name: ibacm
++Version: 1.0.1
+ Release: 1%{?dist}
+ Summary: InfiniBand Communication Manager Assistant
+ 
+@@ -14,7 +14,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+ BuildRequires: libibverbs-devel >= 1.1-1
+ 
+ %description
+-ib_acm assists with establishing communication over Infiniband.
++ibacm assists with establishing communication over Infiniband.
+ 
+ %package svc
+ Summary: IB CM pre-connection service application