From 85686fb2e97f50a20c0cd3940bfea75cf6c7b24d869b3b174b92c2f8f85511b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josef=20M=C3=B6llers?= <josef.moellers@suse.com>
Date: Mon, 3 Apr 2017 12:33:44 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/science:HPC/opa-ff?expand=0&rev=21

---
 opa-ff.changes |  7 +++++++
 opa-ff.spec    | 41 +++++++++++++++++++++++++++++------------
 2 files changed, 36 insertions(+), 12 deletions(-)

diff --git a/opa-ff.changes b/opa-ff.changes
index edfa4f4..cb66447 100644
--- a/opa-ff.changes
+++ b/opa-ff.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Apr  3 12:30:57 UTC 2017 - josef.moellers@suse.com
+
+- Package opa-address-resolution-devel renamed to
+  opa-address-resolution, then .so's and .h files packaged
+  into a new opa-address-resolution-devel.
+
 -------------------------------------------------------------------
 Tue Mar 28 11:35:42 CEST 2017 - pth@suse.de
 
diff --git a/opa-ff.spec b/opa-ff.spec
index ffd74ee..e5c5bbd 100644
--- a/opa-ff.spec
+++ b/opa-ff.spec
@@ -32,9 +32,7 @@ Patch2:         0001-Add-shebang-for-exp-files.patch
 BuildRequires:  gcc-c++
 BuildRequires:  libexpat-devel
 BuildRequires:  rdma-core-devel
-# New:
 BuildRequires:  librdmacm1
-# end New
 BuildRequires:  libopenssl-devel
 BuildRequires:  ncurses-devel
 BuildRequires:  tcl-devel
@@ -47,7 +45,7 @@ ExclusiveArch:  x86_64
 
 %description
 The %{name} contains basic tools and libraries for Intel Omni-Path fabric management applications. This
-includes: the opa-fastfabric opa-basic-tools, opa-address-resolution-devel
+includes: the opa-fastfabric opa-basic-tools, opa-address-resolution
 
 %package     -n opa-basic-tools
 Summary:        Managment level tools and scripts
@@ -70,15 +68,26 @@ Requires:       atlas
 %description -n opa-fastfabric
 Contains tools for managing fabric on a managment node.
 
-%package -n opa-address-resolution-devel
+%package -n opa-address-resolution
 Summary:        Contains Address Resolution manager
 Group:          Development/Libraries/C and C++
 Requires:       opa-basic-tools
 AutoReq:    no
 
-%description -n opa-address-resolution-devel
+%description -n opa-address-resolution
 This is to be filled out more concisely later.
 
+%package -n opa-address-resolution-devel
+Summary:        Development files for the Address Resolution manager
+Group:          Development/Libraries/C and C++
+Requires:       opa-basic-tools
+Requires:       opa-address-resolution = %{version}
+AutoReq:    no
+
+%description -n opa-address-resolution-devel
+This package contains the include files and libraries
+required to develop programs for the opa-address-resolution package.
+
 %prep
 %setup -q -n opa-ff
 %patch1 -p1
@@ -142,8 +151,6 @@ mkdir -p %{buildroot}%{opasysconfdir}
 mkdir -p %{buildroot}%{_includedir}/infiniband
 mkdir -p %{buildroot}%{_mandir}/man1
 mkdir -p %{buildroot}%{_mandir}/man8
-# mkdir -p %{buildroot}/opt
-# ln -s %{pseudo_opt} %{buildroot}/opt/opa
 mkdir -p %{buildroot}%{_sysconfdir}/sysconfig
 mkdir -p %{buildroot}%{_sysconfdir}/sysconfig/opa
 
@@ -201,7 +208,10 @@ cp -t %{buildroot}/%{opasysconfdir} opamon.conf opamon.si.conf
 #Libraries installing
 cd $(cat %{_builddir}/LIB_PATH)
 cp -t %{buildroot}%{_libdir} libopasadb.so.*
+ln -s libopasadb.so.* %{buildroot}%{_libdir}/libopasadb.so
 cp -t %{buildroot}%{_libdir}/ibacm libdsap.so.*
+ln -s libdsap.so.* %{buildroot}%{_libdir}/ibacm/libdsap.so
+
 
 ln -s /etc/opa/sysconfig/allhosts               %{buildroot}/etc/sysconfig/opa/allhosts
 ln -s /etc/opa/sysconfig/chassis                %{buildroot}/etc/sysconfig/opa/chassis
@@ -283,8 +293,8 @@ cat %{_builddir}/ff_sbin_file.list %{_builddir}/ff_help_file.list %{_builddir}/f
 #make -k clean >/dev/null 2>&1 || : # suppress all errors and return codes from the make clean.
 
 
-%post -n opa-address-resolution-devel -p /sbin/ldconfig
-%postun -n opa-address-resolution-devel -p /sbin/ldconfig
+%post -n opa-address-resolution -p /sbin/ldconfig
+%postun -n opa-address-resolution -p /sbin/ldconfig
 
 %files -n opa-basic-tools -f %{_builddir}/basic_file.list
 %defattr(-,root,root,-)
@@ -316,23 +326,30 @@ cat %{_builddir}/ff_sbin_file.list %{_builddir}/ff_help_file.list %{_builddir}/f
 %config(noreplace) %{opasysconfdir}/switches
 %config(noreplace) %{opasysconfdir}/opaff.xml
 %{opasysconfdir}/opamon.si.conf
+%config(noreplace) %{opasysconfdir}/opamon.si.conf
 %{pseudo_opt}tools/osid_wrapper
 %{_sbindir}/opafmconfigcheck
 %{_sbindir}/opafmconfigdiff
 
 # /opt/opa
 
-%files -n opa-address-resolution-devel
+%files -n opa-address-resolution
 %defattr(-,root,root,-)
 %dir %{_sysconfdir}/rdma/
+%dir %{_libdir}/ibacm/
 #Everything under the bin directory belongs exclusively to opasadb at this time.
 %{_bindir}/*
-%{_libdir}/*
-%{_includedir}/*
+%{_libdir}/*.so.*
+%{_libdir}/ibacm/*.so.*
 %{_mandir}/man1/opa_osd_dump.1*
 %{_mandir}/man1/opa_osd_exercise.1*
 %{_mandir}/man1/opa_osd_perf.1*
 %{_mandir}/man1/opa_osd_query.1*
 %config(noreplace) %{_sysconfdir}/rdma/dsap.conf
 
+%files -n opa-address-resolution-devel
+%{_includedir}/*
+%{_libdir}/libopasadb.so
+%{_libdir}/ibacm/libdsap.so
+
 %changelog