[rdma: 2/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/rdma

[Doug Ledford]

commit 71f0e5b1ba203bf6894d4c9f2c0e8b897eebcc01
Merge: 1cfb1e8 c167d6e
Author: Doug Ledford <dledford at redhat.com>
Date:   Mon Mar 25 18:42:53 2013 -0400

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/rdma
    
    Conflicts:
    	rdma.spec

 rdma.spec |   19 +++++--------------
 1 files changed, 5 insertions(+), 14 deletions(-)
---
diff --cc rdma.spec
index b308637,cd8506a..85aaa14
--- a/rdma.spec
+++ b/rdma.spec
@@@ -6,7 -6,7 +6,7 @@@
  Summary: Infiniband/iWARP Kernel Module Initializer
  Name: rdma
  Version: 2.0
--Release: 7%{?dist}
++Release: 8%{?dist}
  License: GPLv2+
  Group: System Environment/Base
  Source0: rdma.conf
@@@ -27,18 -28,18 +27,6 @@@ Requires(postun): system
  %description 
  User space initialization scripts for the kernel InfiniBand/iWARP drivers
  
--%package sysv
--Summary: Backward compatible SysV init script
--Group: System Environment/Base
--Requires: %{name} = %{version}-%{release}
--Requires(post): chkconfig
--Requires(preun): chkconfig
--
--%description sysv
--The RDMA package has been updated to the newer systemd way of starting
--services, this subpackage contains the old SysV init script that used to
--be used to start the RDMA subsystem in the kernel.
--
  %prep
  
  %build
@@@ -82,12 -97,14 +70,15 @@@ rm -rf %{buildroot
  %{_sysconfdir}/sysconfig/network-scripts/*
  /lib/udev/rules.d/*
  
 -%files sysv
 -%defattr(-,root,root,-)
 -%{_initrddir}/%{name}
 -
  %changelog
- * Mon Mar 25 2013 Doug Ledford <dledford at redhat.com> - 2.0-7
++* Mon Mar 25 2013 Doug Ledford <dledford at redhat.com> - 2.0-8
 +- Drop the sysv package
 +- Add the SRPT module to the conf file and startup script
 +- Add support for the new ocrdma driver from Emulex
 +
+ * Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0-7
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+ 
  * Wed Dec 05 2012 Doug Ledford <dledford at redhat.com> - 2.0-6
  - Add some proper systemd scriptlets
  - Resolves: bz820154, bz816073, bz816389