From e098ff307991ceaa7ac1fae7c23d87e2ccd7b6451e328879117742192cc13dc3 Mon Sep 17 00:00:00 2001
From: Nicolas Morey-Chaisemartin <nmoreychaisemartin@suse.com>
Date: Tue, 27 Mar 2018 11:41:51 +0000
Subject: [PATCH] Accepting request 591495 from
 home:NMoreyChaisemartin:branches:science:HPC

- Update pseudo_opt path to %{_prefix}/lib/opa (bsc#1042721,bsc#1086934)
- Update opasysconfdif to %{_sysconfdir}/opa/
- Minor cleanup of sysconfig install code

OBS-URL: https://build.opensuse.org/request/show/591495
OBS-URL: https://build.opensuse.org/package/show/science:HPC/opa-ff?expand=0&rev=38
---
 opa-ff.changes |  7 +++++++
 opa-ff.spec    | 23 ++++++++---------------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/opa-ff.changes b/opa-ff.changes
index 38327a6..9db9bb3 100644
--- a/opa-ff.changes
+++ b/opa-ff.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Mar 27 06:42:29 UTC 2018 - nmoreychaisemartin@suse.com
+
+- Update pseudo_opt path to %{_prefix}/lib/opa (bsc#1042721,bsc#1086934)
+- Update opasysconfdif to %{_sysconfdir}/opa/
+- Minor cleanup of sysconfig install code
+
 -------------------------------------------------------------------
 Thu Mar  1 16:33:18 UTC 2018 - nmoreychaisemartin@suse.com
 
diff --git a/opa-ff.spec b/opa-ff.spec
index f40e32c..f29a2c9 100644
--- a/opa-ff.spec
+++ b/opa-ff.spec
@@ -20,8 +20,9 @@
 %define opamgt_major 0
 %define opasadb_major 1_0_0
 
-%define pseudo_opt %{_prefix}/lib/opa-ff/
-%define opasysconfdir %{_sysconfdir}/opa/sysconfig
+%define pseudo_opt %{_prefix}/lib/opa/
+%define opasysconfdir %{_sysconfdir}/opa/
+
 Name:           opa-ff
 Version:        10.6.0
 Release:        0
@@ -211,22 +212,15 @@ ln -s libdsap.so.* %{buildroot}%{_libdir}/ibacm/libdsap.so
 cp -t %{buildroot}%{_libdir}/ libopamgt.so.*
 ln -s libopamgt.so.* %{buildroot}%{_libdir}/libopamgt.so
 
-ln -s /etc/opa/sysconfig/allhosts               %{buildroot}/etc/sysconfig/opa/allhosts
-ln -s /etc/opa/sysconfig/chassis                %{buildroot}/etc/sysconfig/opa/chassis
-ln -s /etc/opa/sysconfig/esm_chassis            %{buildroot}//etc/sysconfig/opa/esm_chassis
-ln -s /etc/opa/sysconfig/hosts                  %{buildroot}/etc/sysconfig/opa/hosts
-ln -s /etc/opa/sysconfig/opafastfabric.conf     %{buildroot}/etc/sysconfig/opa/opafastfabric.conf
-ln -s /etc/opa/sysconfig/opaff.xml              %{buildroot}/etc/sysconfig/opa/opaff.xml
-ln -s /etc/opa/sysconfig/opamon.conf            %{buildroot}/etc/sysconfig/opa/opamon.conf
-ln -s /etc/opa/sysconfig/opamon.si.conf         %{buildroot}/etc/sysconfig/opa/opamon.si.conf
-ln -s /etc/opa/sysconfig/ports                  %{buildroot}/etc/sysconfig/opa/ports
-ln -s /etc/opa/sysconfig/switches               %{buildroot}/etc/sysconfig/opa/switches
-
 # Now that we've put everything in the buildroot, copy any default config files to their expected location for user
 # to edit. To prevent nuking existing user configs, the files section of this spec file will reference these as noreplace
 # config files.
 cp %{buildroot}%{pseudo_opt}tools/opafastfabric.conf.def %{buildroot}/%{opasysconfdir}/opafastfabric.conf
 
+for file in $(ls  %{buildroot}/%{opasysconfdir}); do
+	ln -s %{opasysconfdir}/$file %{buildroot}/etc/sysconfig/opa/$file
+done
+
 #Now we do a bunch of work to build the file listing of what belongs to each RPM
 
 # List for basic
@@ -317,9 +311,8 @@ cp %{buildroot}%{pseudo_opt}tools/opafastfabric.conf.def %{buildroot}/%{opasysco
 %dir %{pseudo_opt}samples
 %dir %{pseudo_opt}tools
 
-%dir %{_sysconfdir}/opa
-%dir %{opasysconfdir}
 %dir %{_sysconfdir}/sysconfig/opa
+%{opasysconfdir}
 /etc/sysconfig/opa/*
 
 %config(noreplace) %{opasysconfdir}/opafastfabric.conf