refresh

diff --git a/meta b/meta
index fd4aefd15625dae49c269920af1bbc792b221cfe..272f252cce6e203b63f7295265d6aa62102da447 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,8 @@
 Version: 1
-Previous: e76ef874ae70760f6fba8930ab63c1094dd266bb
-Head: cb84d5c2e087088a56f31120b18d074a27324ba7
+Previous: 6fa8691d034a99c091091bec5e233f674a30ecfe
+Head: 86d39bea42362c5825c7b521e6781305623ec656
 Applied:
-  rpm-fixes: 95324d5588ad60afafcc2e6fd67a5f802ad810d0
-  refresh-temp: cb84d5c2e087088a56f31120b18d074a27324ba7
+  rpm-fixes: 86d39bea42362c5825c7b521e6781305623ec656
 Unapplied:
   dev-name2ip: 8e00708e882239292492e13aa51c82042255933c
   dev-addrsize: 8de02c47fbf595132105a7050ad6f755f49f9a7a

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index abcd290..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,33 +0,0 @@
-Bottom: 4adc00cb9ea51662aad7606f1dd1a00fa980eb02
-Top:    2f0440b7d40120dd34620e10df0369fe437621b4
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-05-31 10:39:46 -0700
-
-Refresh of rpm-fixes
-
----
-
-diff --git a/ibacm.spec.in b/ibacm.spec.in
-index 3837ac3..0c12aa1 100644
---- a/ibacm.spec.in
-+++ b/ibacm.spec.in
-@@ -51,8 +51,8 @@ make %{?_smp_mflags}
- 
- %install
- rm -rf $RPM_BUILD_ROOT
--make DESTDIR=%{buildroot} install
--install -D -m 755 ibacm.init %{buildroot}%{_initrddir}/%{name}
-+make install DESTDIR=$RPM_BUILD_ROOT
-+install -D -m 755 ibacm.init $RPM_BUILD_ROOT{_sysconfdir}/init.d/%{name}
- %makeinstall
- 
- %clean
-@@ -74,7 +74,7 @@ fi
- %{_sbindir}/ibacm
- %{_mandir}/man1/*
- %{_mandir}/man7/*
--%{_initrddir}/ibacm
-+%{_sysconfdir}/init.d/ibacm
- 
- %files devel
- %defattr(-,root,root,-)

diff --git a/patches/rpm-fixes b/patches/rpm-fixes
index 5b2dbbac9130172efc051b9ed58a7a6193b2a9a3..2939df127ad6d7ec615f9b01481bf305a818d61b 100644 (file)
--- a/patches/rpm-fixes
+++ b/patches/rpm-fixes
@@ -1,5 +1,5 @@
 Bottom: 18781a75a9389459fd54f05e6690f13c88dca330
-Top:    4adc00cb9ea51662aad7606f1dd1a00fa980eb02
+Top:    2f0440b7d40120dd34620e10df0369fe437621b4
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-05-29 17:10:10 -0700
 
@@ -23,7 +23,7 @@ index de035bc..ca8a939 100644
        cp ibacm.spec $(distdir)
 +      cp ibacm.init $(distdir)
 diff --git a/ibacm.spec.in b/ibacm.spec.in
-index 771338e..3837ac3 100644
+index 771338e..0c12aa1 100644
 --- a/ibacm.spec.in
 +++ b/ibacm.spec.in
 @@ -7,7 +7,6 @@ Group: System Environment/Daemons
@@ -34,20 +34,24 @@ index 771338e..3837ac3 100644
  BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
  
  BuildRequires: libibverbs-devel >= 1.1-1, autoconf, libtool, libibumad-devel
-@@ -53,7 +52,7 @@ make %{?_smp_mflags}
+@@ -52,8 +51,8 @@ make %{?_smp_mflags}
+ 
  %install
  rm -rf $RPM_BUILD_ROOT
- make DESTDIR=%{buildroot} install
+-make DESTDIR=%{buildroot} install
 -install -D -m 755 %{SOURCE1} %{buildroot}%{_initrddir}/%{name}
-+install -D -m 755 ibacm.init %{buildroot}%{_initrddir}/%{name}
++make install DESTDIR=$RPM_BUILD_ROOT
++install -D -m 755 ibacm.init $RPM_BUILD_ROOT{_sysconfdir}/init.d/%{name}
  %makeinstall
  
  %clean
-@@ -75,7 +74,6 @@ fi
+@@ -75,8 +74,7 @@ fi
  %{_sbindir}/ibacm
  %{_mandir}/man1/*
  %{_mandir}/man7/*
 -%config(noreplace) %{_sysconfdir}/rdma/*
- %{_initrddir}/ibacm
+-%{_initrddir}/ibacm
++%{_sysconfdir}/init.d/ibacm
  
  %files devel
+ %defattr(-,root,root,-)