refresh

diff --git a/meta b/meta
index ff9c1752a598e6b7e599d00643f871df93d507b7..2b6488766ffb5665bdd603f512057fc1332c7c22 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,8 @@
 Version: 1
-Previous: b95b488010a37c7eb575923227c15563453b7304
-Head: e8478428d74538da783367cc8aabeaf5e194efb5
+Previous: bfb4a912fdeb5740a229a5377d357d673d5f66f2
+Head: def1a687c7bcc038948e3872f651a5d4d4543078
 Applied:
-  rpm-fixes: 86d39bea42362c5825c7b521e6781305623ec656
-  refresh-temp: e8478428d74538da783367cc8aabeaf5e194efb5
+  rpm-fixes: def1a687c7bcc038948e3872f651a5d4d4543078
 Unapplied:
   dev-name2ip: 8e00708e882239292492e13aa51c82042255933c
   dev-addrsize: 8de02c47fbf595132105a7050ad6f755f49f9a7a

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 5c0d817..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,46 +0,0 @@
-Bottom: 2f0440b7d40120dd34620e10df0369fe437621b4
-Top:    0c76dac5103d5ceac30c5e6e700c884eddac6292
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-05-31 14:42:18 -0700
-
-Refresh of rpm-fixes
-
----
-
-diff --git a/ibacm.spec.in b/ibacm.spec.in
-index 0c12aa1..138d2dc 100644
---- a/ibacm.spec.in
-+++ b/ibacm.spec.in
-@@ -10,8 +10,8 @@ Source0: http://www.openfabrics.org/downloads/rdmacm/%{name}-%{version}.tar.gz
- BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
- 
- BuildRequires: libibverbs-devel >= 1.1-1, autoconf, libtool, libibumad-devel
--Requires(post): chkconfig
--Requires(preun): chkconfig
-+Requires(post): /sbin/chkconfig
-+Requires(preun): /sbin/chkconfig
- ExcludeArch: s390, s390x
- 
- %description
-@@ -27,6 +27,7 @@ library knows how to talk directly to the %{name} daemon to retrieve data.
- %package devel
- Summary: Headers file needed when building apps to talk directly to ibacm.
- Requires: %{name} = %{version}-%{release}
-+Group: System Environment/Daemons
- 
- %description devel
- Most applications do not need to know how to talk directly to the ibacm
-@@ -60,11 +61,11 @@ rm -rf $RPM_BUILD_ROOT
- 
- %post
- if [ $1 = 1 ]; then
--      chkconfig --add %{name}
-+      /sbin/chkconfig --add %{name}
- fi
- %preun
- if [ $1 = 1 ]; then
--      chkconfig --del %{name}
-+      /sbin/chkconfig --del %{name}
- fi
- 
- %files

diff --git a/patches/rpm-fixes b/patches/rpm-fixes
index 2939df127ad6d7ec615f9b01481bf305a818d61b..1447e801231e3ccc06d4a8c5e680e3c1d45c62ba 100644 (file)
--- a/patches/rpm-fixes
+++ b/patches/rpm-fixes
@@ -1,5 +1,5 @@
 Bottom: 18781a75a9389459fd54f05e6690f13c88dca330
-Top:    2f0440b7d40120dd34620e10df0369fe437621b4
+Top:    0c76dac5103d5ceac30c5e6e700c884eddac6292
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-05-29 17:10:10 -0700
 
@@ -23,10 +23,10 @@ index de035bc..ca8a939 100644
        cp ibacm.spec $(distdir)
 +      cp ibacm.init $(distdir)
 diff --git a/ibacm.spec.in b/ibacm.spec.in
-index 771338e..0c12aa1 100644
+index 771338e..138d2dc 100644
 --- a/ibacm.spec.in
 +++ b/ibacm.spec.in
-@@ -7,7 +7,6 @@ Group: System Environment/Daemons
+@@ -7,12 +7,11 @@ Group: System Environment/Daemons
  License: GPLv2 or BSD
  Url: http://www.openfabrics.org/
  Source0: http://www.openfabrics.org/downloads/rdmacm/%{name}-%{version}.tar.gz
@@ -34,7 +34,22 @@ index 771338e..0c12aa1 100644
  BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
  
  BuildRequires: libibverbs-devel >= 1.1-1, autoconf, libtool, libibumad-devel
-@@ -52,8 +51,8 @@ make %{?_smp_mflags}
+-Requires(post): chkconfig
+-Requires(preun): chkconfig
++Requires(post): /sbin/chkconfig
++Requires(preun): /sbin/chkconfig
+ ExcludeArch: s390, s390x
+ 
+ %description
+@@ -28,6 +27,7 @@ library knows how to talk directly to the %{name} daemon to retrieve data.
+ %package devel
+ Summary: Headers file needed when building apps to talk directly to ibacm.
+ Requires: %{name} = %{version}-%{release}
++Group: System Environment/Daemons
+ 
+ %description devel
+ Most applications do not need to know how to talk directly to the ibacm
+@@ -52,8 +52,8 @@ make %{?_smp_mflags}
  
  %install
  rm -rf $RPM_BUILD_ROOT
@@ -45,7 +60,21 @@ index 771338e..0c12aa1 100644
  %makeinstall
  
  %clean
-@@ -75,8 +74,7 @@ fi
+@@ -61,11 +61,11 @@ rm -rf $RPM_BUILD_ROOT
+ 
+ %post
+ if [ $1 = 1 ]; then
+-      chkconfig --add %{name}
++      /sbin/chkconfig --add %{name}
+ fi
+ %preun
+ if [ $1 = 1 ]; then
+-      chkconfig --del %{name}
++      /sbin/chkconfig --del %{name}
+ fi
+ 
+ %files
+@@ -75,8 +75,7 @@ fi
  %{_sbindir}/ibacm
  %{_mandir}/man1/*
  %{_mandir}/man7/*