From: Sean Hefty <sean.hefty@intel.com>
Date: Wed, 14 Sep 2011 18:44:45 +0000 (-0700)
Subject: refresh
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=b8d87ccbbcd2255745b2890728472bdb50ef03f6;p=~shefty%2Fibacm.git

refresh
---

diff --git a/meta b/meta
index 0837b88..791dac2 100644
--- a/meta
+++ b/meta
@@ -1,9 +1,8 @@
 Version: 1
-Previous: 9c6da783ae8a41ffbe3a822e5c275ba7c8ec6889
-Head: afbdf96f4b02cc749f8615c31b760a5e766ecd71
+Previous: 559f5fc712eec6ffd1c7461fac1a5156994d128e
+Head: 64e188b8bca67ee26a5bcfd2f02d1404bc6355af
 Applied:
-  acm1.0.5: 9c8f352d8c6f5cf5dc59402cbcc7ded40667c435
-  refresh-temp: afbdf96f4b02cc749f8615c31b760a5e766ecd71
+  acm1.0.5: 64e188b8bca67ee26a5bcfd2f02d1404bc6355af
 Unapplied:
   name2ip: 8e00708e882239292492e13aa51c82042255933c
   addr_size: 8de02c47fbf595132105a7050ad6f755f49f9a7a
diff --git a/patches/acm1.0.5 b/patches/acm1.0.5
index fcff6e5..9bda6a7 100644
--- a/patches/acm1.0.5
+++ b/patches/acm1.0.5
@@ -1,5 +1,5 @@
 Bottom: 3d98f5a3a2be46ced4b026df8246d5d4d43784be
-Top:    3d98f5a3a2be46ced4b026df8246d5d4d43784be
+Top:    16af440b78850ae3699e84a235f3155f1c447826
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2011-05-19 13:15:20 -0700
 
@@ -8,4 +8,33 @@ v1.0.5
 
 ---
 
-
+diff --git a/configure.in b/configure.in
+index 293a7ce..736f657 100644
+--- 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(ibacm, 1.0.4, linux-rdma@vger.kernel.org)
++AC_INIT(ibacm, 1.0.5, linux-rdma@vger.kernel.org)
+ AC_CONFIG_SRCDIR([src/acm.c])
+ AC_CONFIG_AUX_DIR(config)
+ AM_CONFIG_HEADER(config.h)
+-AM_INIT_AUTOMAKE(ibacm, 1.0.4)
++AM_INIT_AUTOMAKE(ibacm, 1.0.5)
+ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+ 
+ AM_PROG_LIBTOOL
+diff --git a/ibacm.spec.in b/ibacm.spec.in
+index 7a2ed9f..a926fea 100644
+--- a/ibacm.spec.in
++++ b/ibacm.spec.in
+@@ -1,7 +1,7 @@
+ %define ver @VERSION@
+ 
+ Name: ibacm
+-Version: 1.0.4
++Version: 1.0.5
+ Release: 1%{?dist}
+ Summary: InfiniBand Communication Manager Assistant
diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644
index 5ce952f..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,39 +0,0 @@
-Bottom: 3d98f5a3a2be46ced4b026df8246d5d4d43784be
-Top:    16af440b78850ae3699e84a235f3155f1c447826
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2011-09-14 11:44:45 -0700
-
-Refresh of acm1.0.5
-
----
-
-diff --git a/configure.in b/configure.in
-index 293a7ce..736f657 100644
---- 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(ibacm, 1.0.4, linux-rdma@vger.kernel.org)
-+AC_INIT(ibacm, 1.0.5, linux-rdma@vger.kernel.org)
- AC_CONFIG_SRCDIR([src/acm.c])
- AC_CONFIG_AUX_DIR(config)
- AM_CONFIG_HEADER(config.h)
--AM_INIT_AUTOMAKE(ibacm, 1.0.4)
-+AM_INIT_AUTOMAKE(ibacm, 1.0.5)
- m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
- 
- AM_PROG_LIBTOOL
-diff --git a/ibacm.spec.in b/ibacm.spec.in
-index 7a2ed9f..a926fea 100644
---- a/ibacm.spec.in
-+++ b/ibacm.spec.in
-@@ -1,7 +1,7 @@
- %define ver @VERSION@
- 
- Name: ibacm
--Version: 1.0.4
-+Version: 1.0.5
- Release: 1%{?dist}
- Summary: InfiniBand Communication Manager Assistant