refresh

diff --git a/meta b/meta
index 1e028415fa57c9a7f2359660bf9fb84be77901fe..324d2f3b3852a7cfbc94d0b56c4ab343f6bd11a3 100644 (file)
--- a/meta
+++ b/meta
@@ -1,10 +1,9 @@
 Version: 1
-Previous: 246c073918b898b669ff69a0895ed38b33f3ae35
-Head: 3ace33a5df91e5d26496aebfbd49496305956542
+Previous: 6efc7957def37fd87df6f86afb973f68b7a3d80f
+Head: b3c6c41bfef82dc8a06afe4f1e874bf33a14b1b4
 Applied:
   ibacm-script: b269c99716b03631d584d0ebd11c2a7af0b402c4
-  v1.0.7: cda27201160fd3d2598864b8a20519e377c27357
-  refresh-temp: 3ace33a5df91e5d26496aebfbd49496305956542
+  v1.0.7: b3c6c41bfef82dc8a06afe4f1e874bf33a14b1b4
 Unapplied:
   dev-name2ip: 8e00708e882239292492e13aa51c82042255933c
   dev-addrsize: 8de02c47fbf595132105a7050ad6f755f49f9a7a

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 7a64edb..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,37 +0,0 @@
-Bottom: 56c3b57e8f6b69f8876e34fb297f7585eeb1421d
-Top:    422919c089c623304ae1940eb6bdae4237feb5ab
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-06-29 16:13:37 -0700
-
-Refresh of v1.0.7
-
----
-
-diff --git a/configure.in b/configure.in
-index 57bdbcd..c61496c 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(ibacm, 1.0.6, linux-rdma@vger.kernel.org)\r
-+AC_INIT(ibacm, 1.0.7, 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(ibacm, 1.0.6)\r
-+AM_INIT_AUTOMAKE(ibacm, 1.0.7)\r
- m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])\r
- \r
- AM_PROG_LIBTOOL\r
-diff --git a/ibacm.spec.in b/ibacm.spec.in
-index b3b05ec..5ee52b2 100644
---- a/ibacm.spec.in
-+++ b/ibacm.spec.in
-@@ -1,5 +1,5 @@
- Name: ibacm
--Version: 1.0.6
-+Version: 1.0.7
- Release: 1%{?dist}
- Summary: InfiniBand Communication Manager Assistant

diff --git a/patches/v1.0.7 b/patches/v1.0.7
index 31e0f754651c906e0d8d5690107a15a16a5c5d69..952a43c8b3ed04e8ddff455fe3fc681fc51d207f 100644 (file)
--- a/patches/v1.0.7
+++ b/patches/v1.0.7
@@ -1,5 +1,5 @@
 Bottom: 56c3b57e8f6b69f8876e34fb297f7585eeb1421d
-Top:    56c3b57e8f6b69f8876e34fb297f7585eeb1421d
+Top:    422919c089c623304ae1940eb6bdae4237feb5ab
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-06-29 16:12:58 -0700
 
@@ -10,4 +10,31 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 
 ---
 
-
+diff --git a/configure.in b/configure.in
+index 57bdbcd..c61496c 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(ibacm, 1.0.6, linux-rdma@vger.kernel.org)\r
++AC_INIT(ibacm, 1.0.7, 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(ibacm, 1.0.6)\r
++AM_INIT_AUTOMAKE(ibacm, 1.0.7)\r
+ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])\r
+ \r
+ AM_PROG_LIBTOOL\r
+diff --git a/ibacm.spec.in b/ibacm.spec.in
+index b3b05ec..5ee52b2 100644
+--- a/ibacm.spec.in
++++ b/ibacm.spec.in
+@@ -1,5 +1,5 @@
+ Name: ibacm
+-Version: 1.0.6
++Version: 1.0.7
+ Release: 1%{?dist}
+ Summary: InfiniBand Communication Manager Assistant