refresh

diff --git a/meta b/meta
index 5f7cde5df319923e6979d0ce2bed35e365ea5acf..edcf4c345a2481578d935b185bbf26b66e2efb80 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,8 @@
 Version: 1
-Previous: 665935b7dd256cb44d761370aff1073c76105f28
-Head: d27f0c31fcb1d6eaca559e80cca9298c65eaf131
+Previous: a9d9f6d518005a74f39013b576fec2387b1983b9
+Head: fad2ba09c0e103dbd78543c2a59240cba726a740
 Applied:
-  ofed: bcde473f7369d1f743eb9dbb5d170339905eccf5
-  refresh-temp: d27f0c31fcb1d6eaca559e80cca9298c65eaf131
+  ofed: fad2ba09c0e103dbd78543c2a59240cba726a740
 Unapplied:
   ibacm-release-1-0-1: b44f997f907bbdfe4383ad046c413733474a1423
 Hidden:

diff --git a/patches/ofed b/patches/ofed
index b24b69008cc4bf0d8391f4799c0354402c0522a3..9987eeb49509acea024d391ca3ab4f3b1703363f 100644 (file)
--- a/patches/ofed
+++ b/patches/ofed
@@ -1,5 +1,5 @@
 Bottom: 087d6d362bd4701b1c1d2e3b02fbb873888cbf80
-Top:    45e517f0c814f975a23047f12e93b9106de03972
+Top:    56393beeaea7aa85bb640e1edba4f9f8761283f6
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-06-21 09:08:39 -0700
 
@@ -66,7 +66,7 @@ index 9311602..da59fdd 100644
  \r
  dnl Checks for header files.\r
 diff --git a/ibacm.spec.in b/ibacm.spec.in
-index 2c10e1c..85bd6d6 100644
+index 2c10e1c..5c89be3 100644
 --- a/ibacm.spec.in
 +++ b/ibacm.spec.in
 @@ -1,6 +1,6 @@
@@ -86,3 +86,16 @@ index 2c10e1c..85bd6d6 100644
  
  %package svc
  Summary: IB CM pre-connection service application
+@@ -44,11 +44,9 @@ rm -rf $RPM_BUILD_ROOT
+ %files
+ %defattr(-,root,root,-)
+ %doc AUTHORS COPYING README
+-
+-%files svc
+-%defattr(-,root,root,-)
+ %{_bindir}/*
+ %{_mandir}/man1/*
+ %{_mandir}/man7/*
++%{_includedir}/infiniband/acm.h
+ 
+ %changelog

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index f689cbd..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,26 +0,0 @@
-Bottom: 45e517f0c814f975a23047f12e93b9106de03972
-Top:    56393beeaea7aa85bb640e1edba4f9f8761283f6
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-06-23 14:20:47 -0700
-
-Refresh of ofed
-
----
-
-diff --git a/ibacm.spec.in b/ibacm.spec.in
-index 85bd6d6..5c89be3 100644
---- a/ibacm.spec.in
-+++ b/ibacm.spec.in
-@@ -44,11 +44,9 @@ rm -rf $RPM_BUILD_ROOT
- %files
- %defattr(-,root,root,-)
- %doc AUTHORS COPYING README
--
--%files svc
--%defattr(-,root,root,-)
- %{_bindir}/*
- %{_mandir}/man1/*
- %{_mandir}/man7/*
-+%{_includedir}/infiniband/acm.h
- 
- %changelog