refresh

diff --git a/meta b/meta
index 1582979d545333e4e74975c7c561fe45be25de76..6c07dad122391d89f304955a8627b8cd159abc15 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,8 @@
 Version: 1
-Previous: 01d1f6acce95fce6a49d8626aa8dc3781838ae8a
-Head: 66f49ae61c368b013709b2f94d1fe939730438a7
+Previous: 03738f0a75f1c38a0fca29282f2f91e82f582145
+Head: bcde473f7369d1f743eb9dbb5d170339905eccf5
 Applied:
-  fix-pkg: 70ba851bc652bc2eb8bdcf1d4138703b0db287c2
-  refresh-temp: 66f49ae61c368b013709b2f94d1fe939730438a7
+  fix-pkg: bcde473f7369d1f743eb9dbb5d170339905eccf5
 Unapplied:
   rel-1.0.1: 9481b303832db81034b6e0752566d86b8b729771
 Hidden:

diff --git a/patches/fix-pkg b/patches/fix-pkg
index 86f80c35960d30e24816953a26b3db6933519364..b24b69008cc4bf0d8391f4799c0354402c0522a3 100644 (file)
--- a/patches/fix-pkg
+++ b/patches/fix-pkg
@@ -1,5 +1,5 @@
 Bottom: 087d6d362bd4701b1c1d2e3b02fbb873888cbf80
-Top:    0b2115751401c86f009f07809c320f5c586325d2
+Top:    45e517f0c814f975a23047f12e93b9106de03972
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-06-21 09:08:39 -0700
 
@@ -11,10 +11,10 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/Makefile.am b/Makefile.am
-index 46f68d4..b0d5fff 100644
+index 46f68d4..f36c086 100644
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -8,9 +8,9 @@ util_ib_acme_SOURCES = src/acme.c linux/acme_linux.c src/libacm.c linux/libacm_l
+@@ -8,14 +8,17 @@ util_ib_acme_SOURCES = src/acme.c linux/acme_linux.c src/libacm.c linux/libacm_l
  svc_ib_acm_CFLAGS = $(AM_CFLAGS)
  util_ib_acme_CFLAGS = $(AM_CFLAGS)
  
@@ -26,6 +26,15 @@ index 46f68d4..b0d5fff 100644
  
  man_MANS = \
        man/ib_acme.1 \
+       man/ib_acm.1 \
+       man/ib_acm.7
+ 
+-EXTRA_DIST = src/acm_mad.h src/acm_msg.h src/libacm.h linux/osd.h linux/dlist.h $(man_MANS)
++EXTRA_DIST = src/acm_mad.h src/acm_msg.h src/libacm.h \
++           linux/osd.h linux/dlist.h ibacm.spec.in $(man_MANS)
+ 
++dist-hook: ibacm.spec
++      cp ibacm.spec $(distdir)
 diff --git a/configure.in b/configure.in
 index 9311602..da59fdd 100644
 --- a/configure.in

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index e353ea7..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,23 +0,0 @@
-Bottom: 0b2115751401c86f009f07809c320f5c586325d2
-Top:    45e517f0c814f975a23047f12e93b9106de03972
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-06-21 09:25:19 -0700
-
-Refresh of fix-pkg
-
----
-
-diff --git a/Makefile.am b/Makefile.am
-index b0d5fff..f36c086 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -17,5 +17,8 @@ man_MANS = \
-       man/ib_acm.1 \
-       man/ib_acm.7
- 
--EXTRA_DIST = src/acm_mad.h src/acm_msg.h src/libacm.h linux/osd.h linux/dlist.h $(man_MANS)
-+EXTRA_DIST = src/acm_mad.h src/acm_msg.h src/libacm.h \
-+           linux/osd.h linux/dlist.h ibacm.spec.in $(man_MANS)
- 
-+dist-hook: ibacm.spec
-+      cp ibacm.spec $(distdir)