refresh

diff --git a/meta b/meta
index 611791c787e092c138d4d7b233c9d091b628e066..8103b4ffd6331a8a9bc03c6fe43f61dfca1e2210 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,8 @@
 Version: 1
-Previous: 1dc60bca68f9da80807cbc53f50a3b6f7380939c
-Head: 995ca4ff1bd7d4b61e7cb9f87e2b4e45e5fa1c57
+Previous: 79945c9ff9147ce720c1c32c0b2f07c657585a68
+Head: 9d6c78b38dadab0a864510c029ee27096ae9712b
 Applied:
-  rpm-fixes: 944d84b8567562eda13880bbded30d2756aa213b
-  refresh-temp: 995ca4ff1bd7d4b61e7cb9f87e2b4e45e5fa1c57
+  rpm-fixes: 9d6c78b38dadab0a864510c029ee27096ae9712b
 Unapplied:
   dev-name2ip: 8e00708e882239292492e13aa51c82042255933c
   dev-addrsize: 8de02c47fbf595132105a7050ad6f755f49f9a7a

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index a7b2af0..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,34 +0,0 @@
-Bottom: b05c022f69c1931243ff49a3fc43e9b1e6864de9
-Top:    4d2b3a92eac9a902aa8babf21c0f083770a4c9da
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-05-30 12:49:15 -0700
-
-Refresh of rpm-fixes
-
----
-
-diff --git a/Makefile.am b/Makefile.am
-index de035bc..44ef0b5 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:
-       cp ibacm.spec $(distdir)
-+      cp ibacm.init $(distdir)
-diff --git a/ibacm.spec.in b/ibacm.spec.in
-index b1b1cb9..3837ac3 100644
---- a/ibacm.spec.in
-+++ b/ibacm.spec.in
-@@ -74,7 +74,7 @@ fi
- %{_sbindir}/ibacm
- %{_mandir}/man1/*
- %{_mandir}/man7/*
--%{_initrddir}/ibacm.init
-+%{_initrddir}/ibacm
- 
- %files devel
- %defattr(-,root,root,-)

diff --git a/patches/rpm-fixes b/patches/rpm-fixes
index 270c7b0dc0496a33b46d7ac0c4098d522e0ef1b9..a109ff2dec4443b39d34fc63453dd2188cead20a 100644 (file)
--- a/patches/rpm-fixes
+++ b/patches/rpm-fixes
@@ -1,5 +1,5 @@
 Bottom: 18781a75a9389459fd54f05e6690f13c88dca330
-Top:    b05c022f69c1931243ff49a3fc43e9b1e6864de9
+Top:    4d2b3a92eac9a902aa8babf21c0f083770a4c9da
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-05-29 17:10:10 -0700
 
@@ -10,8 +10,20 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 
 ---
 
+diff --git a/Makefile.am b/Makefile.am
+index de035bc..44ef0b5 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:
+       cp ibacm.spec $(distdir)
++      cp ibacm.init $(distdir)
 diff --git a/ibacm.spec.in b/ibacm.spec.in
-index 771338e..b1b1cb9 100644
+index 771338e..3837ac3 100644
 --- a/ibacm.spec.in
 +++ b/ibacm.spec.in
 @@ -7,7 +7,6 @@ Group: System Environment/Daemons
@@ -31,13 +43,11 @@ index 771338e..b1b1cb9 100644
  %makeinstall
  
  %clean
-@@ -75,8 +74,7 @@ fi
+@@ -75,7 +74,6 @@ fi
  %{_sbindir}/ibacm
  %{_mandir}/man1/*
  %{_mandir}/man7/*
 -%config(noreplace) %{_sysconfdir}/rdma/*
--%{_initrddir}/ibacm
-+%{_initrddir}/ibacm.init
+ %{_initrddir}/ibacm
  
  %files devel
- %defattr(-,root,root,-)