refresh

diff --git a/meta b/meta
index a8192dad54dcdbb86e3f5e0a22009cf77a1892e3..53de8dce264627a98c4a847ce62709621712fd55 100644 (file)
--- a/meta
+++ b/meta
@@ -1,12 +1,11 @@
 Version: 1
-Previous: 9f2f39adde17074608ac9117e2f762fdfcbf535d
-Head: cc8fd48f95168634a31b9fb03b3f5214fd11a294
+Previous: 27d5c8ef372ca5ca5cf72260e87dd4f7bae30ee7
+Head: 84d8d047a7b312fd84f9e34b1f8c57211c2064d3
 Applied:
   af_ib: fb683ba55480ada43c09aa48b3cb18bde139f72c
   rename-ibacm: 62fc4bdee12905d85332875439240523fad7bee0
   file-loc: 19447bec1a6b2cae7f27654010530f95403c2239
-  init-script: 4d9833eaf6e6bf757d2ee65af814722ccba3b019
-  refresh-temp: cc8fd48f95168634a31b9fb03b3f5214fd11a294
+  init-script: 84d8d047a7b312fd84f9e34b1f8c57211c2064d3
 Unapplied:
   fixup-man: 299df9b474d21a5bf1f9aa103248198e4198eefd
   dev-name2ip: 8e00708e882239292492e13aa51c82042255933c

diff --git a/patches/init-script b/patches/init-script
index 4bf50bc932a8c5f23cfacf4cbf7ab336794b888c..526b09ba9cd27ed5e137eb74f2250810f49ceda6 100644 (file)
--- a/patches/init-script
+++ b/patches/init-script
@@ -1,5 +1,5 @@
 Bottom: f12645dfa0a12d7006a65beabc21e55ad5dd4037
-Top:    5d9a7f42254544cdbaae0bfe0b6ec861066dba01
+Top:    dd59f622c11eb9c1163e20f31e354f0b88b7d058
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-03-22 10:26:25 -0700
 
@@ -120,10 +120,20 @@ index 0000000..8f863eb
 +
 +exit $RC
 diff --git a/ibacm.spec.in b/ibacm.spec.in
-index ac7f06f..b9d73d2 100644
+index ac7f06f..6e7f8e4 100644
 --- a/ibacm.spec.in
 +++ b/ibacm.spec.in
-@@ -13,7 +13,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+@@ -5,15 +5,16 @@ Version: 1.0.5
+ Release: 1%{?dist}
+ Summary: InfiniBand Communication Manager Assistant
+ 
+-Group: System Environment/Libraries
++Group: System Environment/Daemons
+ License: GPLv2 or BSD
+ Url: http://www.openfabrics.org/
+ Source: http://www.openfabrics.org/downloads/rdmacm/%{name}-%{version}.tar.gz
++Source1: ibacm.init
+ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
  
  BuildRequires: libibverbs-devel >= 1.1-1, autoconf, libtool, libibumad-devel
  Requires(post): chkconfig
@@ -132,3 +142,12 @@ index ac7f06f..b9d73d2 100644
  ExcludeArch: s390, s390x
  
  %description
+@@ -31,7 +32,7 @@ Summary: Headers file needed when building apps to talk directly to ibacm.
+ Requires: %{name} = %{version}-%{release}
+ 
+ %description devel
+-Most applications do not need to know how to talk directly to the ib_acm
++Most applications do not need to know how to talk directly to the ibacm
+ daemon, but it does have a socket that it listens on, and it has a
+ specific protocol for incoming/outgoing data.  So if you wish to build
+ the ability to communicate directly with ib_acm into your own application,

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index e9d6dc2..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,35 +0,0 @@
-Bottom: 5d9a7f42254544cdbaae0bfe0b6ec861066dba01
-Top:    dd59f622c11eb9c1163e20f31e354f0b88b7d058
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-03-30 15:43:06 -0700
-
-Refresh of init-script
-
----
-
-diff --git a/ibacm.spec.in b/ibacm.spec.in
-index b9d73d2..6e7f8e4 100644
---- a/ibacm.spec.in
-+++ b/ibacm.spec.in
-@@ -5,10 +5,11 @@ Version: 1.0.5
- Release: 1%{?dist}
- Summary: InfiniBand Communication Manager Assistant
- 
--Group: System Environment/Libraries
-+Group: System Environment/Daemons
- License: GPLv2 or BSD
- Url: http://www.openfabrics.org/
- Source: http://www.openfabrics.org/downloads/rdmacm/%{name}-%{version}.tar.gz
-+Source1: ibacm.init
- BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
- 
- BuildRequires: libibverbs-devel >= 1.1-1, autoconf, libtool, libibumad-devel
-@@ -31,7 +32,7 @@ Summary: Headers file needed when building apps to talk directly to ibacm.
- Requires: %{name} = %{version}-%{release}
- 
- %description devel
--Most applications do not need to know how to talk directly to the ib_acm
-+Most applications do not need to know how to talk directly to the ibacm
- daemon, but it does have a socket that it listens on, and it has a
- specific protocol for incoming/outgoing data.  So if you wish to build
- the ability to communicate directly with ib_acm into your own application,