refresh

diff --git a/meta b/meta
index 4f306ad2010e03558ace8599576844710a813277..82b1c3a6ebdd092f9be962cc854888b34e3d5db4 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,8 @@
 Version: 1
-Previous: f187cef6c8a9837136dc32e4261dd00553ec3840
-Head: c4fdf62cd9c3f592033cbe27af174953e0c97e3e
+Previous: a9b0c4ea30fe8b4e09e74793ebc6302d34ac74e1
+Head: 4180361f0075cda785522424f8891cef728ebbdf
 Applied:
-  sbin: 77526bcf86b8ce208b9cf16e0ae3b695694b3365
-  refresh-temp: c4fdf62cd9c3f592033cbe27af174953e0c97e3e
+  sbin: 4180361f0075cda785522424f8891cef728ebbdf
 Unapplied:
   sa: 03cb558f50303b5f1d17ed23c799ddab6f5d0c47
   rel1.0.1: e8a7fa69bd9fdba6044c46b7d488c282aa79b069

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 41aece9..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,23 +0,0 @@
-Bottom: 8f832c4b995dc35d3fb1a25f84cf8609e7bbda3c
-Top:    9e62a42de0647b781fb0d3605f0ae1423ea5477a
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-07-02 12:22:50 -0700
-
-Refresh of sbin
-
----
-
-diff --git a/ibacm.spec.in b/ibacm.spec.in
-index eace328..21ba878 100644
---- a/ibacm.spec.in
-+++ b/ibacm.spec.in
-@@ -44,7 +44,8 @@ rm -rf $RPM_BUILD_ROOT
- %files
- %defattr(-,root,root,-)
- %doc AUTHORS COPYING README
--%{_sbindir}/*
-+%{_sbindir}/ib_acm
-+%{_sbindir}/ib_acme
- %{_mandir}/man1/*
- %{_mandir}/man7/*
- %{_includedir}/infiniband/acm.h

diff --git a/patches/sbin b/patches/sbin
index e26c823ed41bc1d85e1cbf286e99d33c87269399..c28629c0f363c38afbb39c947ff628f4fb077f3f 100644 (file)
--- a/patches/sbin
+++ b/patches/sbin
@@ -1,5 +1,5 @@
 Bottom: 9593c1ec8c636dfc98ed635f95b248f4373c2065
-Top:    8f832c4b995dc35d3fb1a25f84cf8609e7bbda3c
+Top:    9e62a42de0647b781fb0d3605f0ae1423ea5477a
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-07-02 10:58:57 -0700
 
@@ -11,15 +11,16 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/ibacm.spec.in b/ibacm.spec.in
-index 5c89be3..eace328 100644
+index 5c89be3..21ba878 100644
 --- a/ibacm.spec.in
 +++ b/ibacm.spec.in
-@@ -44,7 +44,7 @@ rm -rf $RPM_BUILD_ROOT
+@@ -44,7 +44,8 @@ rm -rf $RPM_BUILD_ROOT
  %files
  %defattr(-,root,root,-)
  %doc AUTHORS COPYING README
 -%{_bindir}/*
-+%{_sbindir}/*
++%{_sbindir}/ib_acm
++%{_sbindir}/ib_acme
  %{_mandir}/man1/*
  %{_mandir}/man7/*
  %{_includedir}/infiniband/acm.h