From c5d36613f737ab7a9823de193b35d7a09f7185aea6451640c9bf269c374e4911 Mon Sep 17 00:00:00 2001
From: Nicolas Morey-Chaisemartin <nmoreychaisemartin@suse.com>
Date: Mon, 15 May 2017 16:34:17 +0000
Subject: [PATCH] Accepting request 494990 from science:HPC:rdma-core

- Split rdma-ndd into its own package to replace previous package
 from infiniband-diags (bsc#1039146).

OBS-URL: https://build.opensuse.org/request/show/494990
OBS-URL: https://build.opensuse.org/package/show/science:HPC/rdma-core?expand=0&rev=24
---
 rdma-core.changes |  6 ++++++
 rdma-core.spec    | 46 +++++++++++++++++++++++++++++++++++++---------
 2 files changed, 43 insertions(+), 9 deletions(-)

diff --git a/rdma-core.changes b/rdma-core.changes
index d9a6c8e..d4c0252 100644
--- a/rdma-core.changes
+++ b/rdma-core.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon May 15 16:28:00 UTC 2017 - nmoreychaisemartin@suse.com
+
+- Split rdma-ndd into its own package to replace previous package
+ from infiniband-diags (bsc#1039146).
+
 -------------------------------------------------------------------
 Mon May 15 12:48:42 UTC 2017 - nmoreychaisemartin@suse.com
 
diff --git a/rdma-core.spec b/rdma-core.spec
index 030d910..3f5799f 100644
--- a/rdma-core.spec
+++ b/rdma-core.spec
@@ -44,7 +44,8 @@ Group:          Productivity/Networking/Other
 #  providers/rxe/ Incorporates code from ipathverbs and contains the patent clause
 #  providers/hfi1verbs Uses the 3 Clause BSD license
 Url:            https://github.com/linux-rdma/rdma-core
-Source:         %{name}-%{version}%{git_ver}.tar.xz
+Source0:         %{name}-%{version}%{git_ver}.tar.xz
+Source1:        baselibs.conf
 BuildRequires:  binutils
 BuildRequires:  cmake >= 2.8.11
 BuildRequires:  gcc
@@ -280,6 +281,19 @@ Provides:       srptools = %{version}
 In conjunction with the kernel ib_srp driver, srp_daemon allows you to
 discover and use SCSI devices via the SCSI RDMA Protocol over InfiniBand.
 
+%package     -n rdma-ndd
+Summary:        Daemon to manage RDMA Node Description
+Group:          System Environment/Daemons
+Requires:       %{name} = %{version}
+# The udev rules in rdma need to be aware of rdma-ndd:
+Conflicts:      rdma < 2.1
+%{?systemd_requires}
+
+%description -n rdma-ndd
+rdma-ndd is a system daemon which watches for rdma device changes and/or
+hostname changes and updates the Node Description of the rdma devices based
+on those changes.
+
 %prep
 %setup -q -n  %{name}-%{version}%{git_ver}
 
@@ -415,20 +429,28 @@ rm -rf %{buildroot}/%{_initddir}/
 %systemd_postun_with_restart iwpmd.service
 
 %pre
-%service_add_pre rdma-ndd.service
 %service_add_pre rdma.service
 
 %post
-%service_add_post rdma-ndd.service rdma.service
+%service_add_post rdma.service
 
 %preun
-%service_del_preun rdma-ndd.service
 %service_del_preun rdma.service
 
 %postun
-%service_del_postun rdma-ndd.service
 %service_del_postun rdma.service
 
+%pre -n rdma-ndd
+%service_add_pre rdma-ndd.service
+
+%preun -n rdma-ndd
+%service_del_preun rdma-ndd.service
+
+%post -n rdma-ndd
+%service_add_post rdma-ndd.service
+
+%postun -n rdma-ndd
+%service_del_postun rdma-ndd.service
 %files
 %defattr(-,root,root)
 %dir %{_sysconfdir}/rdma
@@ -439,6 +461,7 @@ rm -rf %{buildroot}/%{_initddir}/
 %doc %{_docdir}/%{name}-%{version}/README.md
 %exclude %{_sysconfdir}/rdma/ibacm_opts.cfg
 %config(noreplace) %{_sysconfdir}/rdma/*
+%exclude  %{_libexecdir}/udev/rules.d/rdma-ndd.rules
 %config(noreplace) %{_libexecdir}/udev/rules.d/*
 %config(noreplace) %{_sysconfdir}/modprobe.d/50-mlx4.conf
 %config(noreplace) %{_sysconfdir}/modprobe.d/50-truescale.conf
@@ -455,12 +478,8 @@ rm -rf %{buildroot}/%{_initddir}/
 %{_libexecdir}/rdma-fixup-mtrr.awk
 %{_libexecdir}/mlx4-setup.sh
 %{_libexecdir}/truescale-serdes.cmds
-%{_sbindir}/rdma-ndd
-%{_unitdir}/rdma-ndd.service
-%{_mandir}/man8/rdma-ndd.*
 %license COPYING.*
 %{_sbindir}/rcrdma
-%{_sbindir}/rcrdma-ndd
 
 %files devel
 %defattr(-,root,root)
@@ -589,4 +608,13 @@ rm -rf %{buildroot}/%{_initddir}/
 %{_mandir}/man1/srp_daemon.1*
 %doc %{_docdir}/%{name}-%{version}/ibsrpdm.md
 
+%files -n rdma-ndd
+%defattr(-, root, root)
+%{_sbindir}/rdma-ndd
+%{_sbindir}/rcrdma-ndd
+%{_unitdir}/rdma-ndd.service
+%{_mandir}/man8/rdma-ndd.*
+%{_mandir}/man8/rdma-ndd.8*
+%config(noreplace) %{_libexecdir}/udev/rules.d/rdma-ndd.rules
+
 %changelog