commit

diff --git a/meta b/meta
index 9051591340dbb96426186ae61e360a7e0ce4cb54..e8c4d53948d4a39c3aa67d381692b14c15afad68 100644 (file)
--- a/meta
+++ b/meta
@@ -1,8 +1,7 @@
 Version: 1
-Previous: 0614649a0a7d8d5ef5adfb531807a40aa56f5188
+Previous: b02b854552d64e3bd4dfaf6850c23130ba33de7f
 Head: f06ce5a568e8e66ed9fa5702d1be24ca1565ea5e
 Applied:
-  rpm-fixes: f06ce5a568e8e66ed9fa5702d1be24ca1565ea5e
 Unapplied:
   ibacm-security-fix-replace-spr: 5d8f3e29f8552ed33e63d57056f17abe2602632a
   dev-name2ip: 8e00708e882239292492e13aa51c82042255933c

diff --git a/patches/rpm-fixes b/patches/rpm-fixes
deleted file mode 100644 (file)
index a326b4a..0000000
--- a/patches/rpm-fixes
+++ /dev/null
@@ -1,74 +0,0 @@
-Bottom: 94cf3ac2f65474e3ae10d0759a997a516a0f0222
-Top:    ed1daf3316e1e0c218b28245bc117c0bc1fd772f
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-05-29 17:10:10 -0700
-
-ibacm: Fix rmpbuild issues
-
-Signed-off-by: Sean Hefty <sean.hefty@intel.com>
-
-
----
-
-diff --git a/ibacm.spec.in b/ibacm.spec.in
-index 771338e..138d2dc 100644
---- a/ibacm.spec.in
-+++ b/ibacm.spec.in
-@@ -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
--Source1: ibacm.init
- 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
-@@ -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
--make DESTDIR=%{buildroot} install
--install -D -m 755 %{SOURCE1} %{buildroot}%{_initrddir}/%{name}
-+make install DESTDIR=$RPM_BUILD_ROOT
-+install -D -m 755 ibacm.init $RPM_BUILD_ROOT{_sysconfdir}/init.d/%{name}
- %makeinstall
- 
- %clean
-@@ -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/*
--%config(noreplace) %{_sysconfdir}/rdma/*
--%{_initrddir}/ibacm
-+%{_sysconfdir}/init.d/ibacm
- 
- %files devel
- %defattr(-,root,root,-)