refresh

diff --git a/meta b/meta
index 8ae78b17e94e6ad346b8124b467c2e11d2729026..00418808ad3d8422f6d4cfaf292333bc84511894 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,8 @@
 Version: 1
-Previous: 3f24d95df42031afd3a3f5a65a507937565e7ad9
-Head: 6e60f32e6cc439bdaf04d8c02db3bed1ed2a4a4f
+Previous: a7f0def97bc93c91ee4b2f44b95f685b53d5ca68
+Head: 95324d5588ad60afafcc2e6fd67a5f802ad810d0
 Applied:
-  rpm-fixes: 31ff69b12184d554c5d5e527d2d8505f75142cf8
-  refresh-temp: 6e60f32e6cc439bdaf04d8c02db3bed1ed2a4a4f
+  rpm-fixes: 95324d5588ad60afafcc2e6fd67a5f802ad810d0
 Unapplied:
   dev-name2ip: 8e00708e882239292492e13aa51c82042255933c
   dev-addrsize: 8de02c47fbf595132105a7050ad6f755f49f9a7a

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 1113dbd..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,21 +0,0 @@
-Bottom: 9c136289e1faf4c8025adfdc26d5caa31df60fb0
-Top:    4adc00cb9ea51662aad7606f1dd1a00fa980eb02
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-05-31 10:06:23 -0700
-
-Refresh of rpm-fixes
-
----
-
-diff --git a/Makefile.am b/Makefile.am
-index de035bc..ca8a939 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -25,5 +25,6 @@ EXTRA_DIST = src/acm_mad.h src/libacm.h ibacm.init.in \
- install-exec-hook:
-       install -D -m 755 ibacm.init $(DESTDIR)$(sysconfdir)/init.d/ibacm;
- 
--dist-hook: ibacm.spec
-+dist-hook: ibacm.spec ibacm.init
-       cp ibacm.spec $(distdir)
-+      cp ibacm.init $(distdir)

diff --git a/patches/rpm-fixes b/patches/rpm-fixes
index 4599670329cd5191a55d385c880a97ef83f2b147..5b2dbbac9130172efc051b9ed58a7a6193b2a9a3 100644 (file)
--- a/patches/rpm-fixes
+++ b/patches/rpm-fixes
@@ -1,5 +1,5 @@
 Bottom: 18781a75a9389459fd54f05e6690f13c88dca330
-Top:    9c136289e1faf4c8025adfdc26d5caa31df60fb0
+Top:    4adc00cb9ea51662aad7606f1dd1a00fa980eb02
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-05-29 17:10:10 -0700
 
@@ -10,6 +10,18 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 
 ---
 
+diff --git a/Makefile.am b/Makefile.am
+index de035bc..ca8a939 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -25,5 +25,6 @@ EXTRA_DIST = src/acm_mad.h src/libacm.h ibacm.init.in \
+ install-exec-hook:
+       install -D -m 755 ibacm.init $(DESTDIR)$(sysconfdir)/init.d/ibacm;
+ 
+-dist-hook: ibacm.spec
++dist-hook: ibacm.spec ibacm.init
+       cp ibacm.spec $(distdir)
++      cp ibacm.init $(distdir)
 diff --git a/ibacm.spec.in b/ibacm.spec.in
 index 771338e..3837ac3 100644
 --- a/ibacm.spec.in