refresh

diff --git a/meta b/meta
index 798706618abe09de9185dbed9334ec1edf48b35e..99c1b4378c9f31f860e4e533673b03de2dd06feb 100644 (file)
--- a/meta
+++ b/meta
@@ -1,12 +1,11 @@
 Version: 1
-Previous: d1fabf3809ec3c47049e49688f9c6d241e668964
-Head: b4ba7ecca30ee11995771cd7b5940452b5e67247
+Previous: ce6778679eaeaa29a076fe6b54ec947c22b238b5
+Head: 9c635a29c0fff899915c5ac3775d8cfc748c2573
 Applied:
   af_ib: fb683ba55480ada43c09aa48b3cb18bde139f72c
   rename-ibacm: 62fc4bdee12905d85332875439240523fad7bee0
   file-loc: 19447bec1a6b2cae7f27654010530f95403c2239
-  init-script: 65cc4aade213c1ac63780babf6836801006f4146
-  refresh-temp: b4ba7ecca30ee11995771cd7b5940452b5e67247
+  init-script: 9c635a29c0fff899915c5ac3775d8cfc748c2573
 Unapplied:
   fixup-man: a4a1637f34f665894dc0db5a29867db6de744a43
   rel-1.0.6: c07d89d883f1b6be6a664e95a98e3fc29f73a4b0

diff --git a/patches/init-script b/patches/init-script
index 7c779046c9729013f5b266a4d131046031f28cfb..27f3478dd72e1f877396799cc47804f617233a77 100644 (file)
--- a/patches/init-script
+++ b/patches/init-script
@@ -1,5 +1,5 @@
 Bottom: f12645dfa0a12d7006a65beabc21e55ad5dd4037
-Top:    142649f64d3b42cfd8499546e2b2935063e52780
+Top:    e13cf82bcf8ef15984008ac39bacd58fa4c03925
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-03-22 10:26:25 -0700
 
@@ -146,15 +146,14 @@ index 0000000..8f863eb
 +
 +exit $RC
 diff --git a/ibacm.spec.in b/ibacm.spec.in
-index ac7f06f..7ca7efa 100644
+index ac7f06f..31d5a07 100644
 --- a/ibacm.spec.in
 +++ b/ibacm.spec.in
 @@ -1,19 +1,18 @@
 -%define ver @VERSION@
 -
  Name: ibacm
--Version: 1.0.5
-+Version: 1.0.6
+ 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 (file)
index c5c9e7e..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,19 +0,0 @@
-Bottom: 142649f64d3b42cfd8499546e2b2935063e52780
-Top:    e13cf82bcf8ef15984008ac39bacd58fa4c03925
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-03-30 15:51:38 -0700
-
-Refresh of init-script
-
----
-
-diff --git a/ibacm.spec.in b/ibacm.spec.in
-index 7ca7efa..31d5a07 100644
---- a/ibacm.spec.in
-+++ b/ibacm.spec.in
-@@ -1,5 +1,5 @@
- Name: ibacm
--Version: 1.0.6
-+Version: 1.0.5
- Release: 1%{?dist}
- Summary: InfiniBand Communication Manager Assistant