refresh

diff --git a/meta b/meta
index 3681a91b4027f8b09cb576baa524a3333805bb92..285e547134cb00fb9c8b8626f2e7f5e9aac8c590 100644 (file)
--- a/meta
+++ b/meta
@@ -1,14 +1,13 @@
 Version: 1
-Previous: 42dbd83caedf8d9f5a7c01acaf568045ef15c6ab
-Head: 6bd7cd582aa3fade1bf7514091875093e34af34f
+Previous: 9d64de92c3cdcaedae6a0055f67ee1d03f10fc0a
+Head: a2871fa6feff9e7f40136b7ff1ad4d0de8f482fd
 Applied:
   af_ib: fb683ba55480ada43c09aa48b3cb18bde139f72c
   rename-ibacm: 62fc4bdee12905d85332875439240523fad7bee0
   file-loc: 19447bec1a6b2cae7f27654010530f95403c2239
   init-script: 9c635a29c0fff899915c5ac3775d8cfc748c2573
   fixup-man: 4f65bb9512a9583202efea8f09925aaf0fdf1d86
-  rel-1.0.6: 41e52b870a9d492f33f32389e70c4962c48db13e
-  refresh-temp: 6bd7cd582aa3fade1bf7514091875093e34af34f
+  rel-1.0.6: a2871fa6feff9e7f40136b7ff1ad4d0de8f482fd
 Unapplied:
   dev-name2ip: 8e00708e882239292492e13aa51c82042255933c
   dev-addrsize: 8de02c47fbf595132105a7050ad6f755f49f9a7a

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index a1c7aa4..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,19 +0,0 @@
-Bottom: aff78990b756ffa949668dc06392e2d8d11361e0
-Top:    5f3116fb15056a43291e607fb785ef6458fe0087
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-03-30 15:51:56 -0700
-
-Refresh of rel-1.0.6
-
----
-
-diff --git a/ibacm.spec.in b/ibacm.spec.in
-index 31d5a07..7ca7efa 100644
---- a/ibacm.spec.in
-+++ b/ibacm.spec.in
-@@ -1,5 +1,5 @@
- Name: ibacm
--Version: 1.0.5
-+Version: 1.0.6
- Release: 1%{?dist}
- Summary: InfiniBand Communication Manager Assistant

diff --git a/patches/rel-1.0.6 b/patches/rel-1.0.6
index 111639a973683a8ff1a50ad4cd732eddf1238c9c..9d6f2417ad4593b39584a1d7fe45f3d5b9289f50 100644 (file)
--- a/patches/rel-1.0.6
+++ b/patches/rel-1.0.6
@@ -1,5 +1,5 @@
 Bottom: 937ae6f3d5625ad455370bf9417a3b8b32e7498b
-Top:    aff78990b756ffa949668dc06392e2d8d11361e0
+Top:    5f3116fb15056a43291e607fb785ef6458fe0087
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-03-30 15:46:39 -0700
 
@@ -25,4 +25,14 @@ index 736f657..7a6e1e8 100644
 +AM_INIT_AUTOMAKE(ibacm, 1.0.6)\r
  m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])\r
  \r
- AM_PROG_LIBTOOL
+ AM_PROG_LIBTOOL\r
+diff --git a/ibacm.spec.in b/ibacm.spec.in
+index 31d5a07..7ca7efa 100644
+--- a/ibacm.spec.in
++++ b/ibacm.spec.in
+@@ -1,5 +1,5 @@
+ Name: ibacm
+-Version: 1.0.5
++Version: 1.0.6
+ Release: 1%{?dist}
+ Summary: InfiniBand Communication Manager Assistant