Accepting request 617425 from home:NMoreyChaisemartin:branches:science:HPC

- Update to v10.7.0.0.133 (fate#325049)
  * No changelog available
- Rebase opa-ff-suse-build-fixes.patch to the latest sources
- Update opa-ff-add-shebang-for-exp-files.patchto not use /usr/bin/env

OBS-URL: https://build.opensuse.org/request/show/617425
OBS-URL: https://build.opensuse.org/package/show/science:HPC/opa-ff?expand=0&rev=43
This commit is contained in:
Nicolas Morey-Chaisemartin
2018-06-18 07:35:07 +00:00
committed by Git OBS Bridge
parent 5ee05e80fb
commit 7c272a7d12
7 changed files with 140 additions and 126 deletions

View File

@@ -16,7 +16,7 @@
#
%define git_ver .0.131.0.3ca3fd5
%define git_ver .0.133.0.c6b993a4c724
%define opamgt_major 0
%define opasadb_major 1_0_0
@@ -24,10 +24,10 @@
%define opasysconfdir %{_sysconfdir}/opa/
Name: opa-ff
Version: 10.6.0
Version: 10.7.0
Release: 0
Summary: Intel Omni-Path basic tools and libraries for fabric managment
License: BSD-3-Clause or GPL-2.0
License: BSD-3-Clause OR GPL-2.0-only
Group: Productivity/Networking/System
Url: http://www.intel.com/
Source0: %{name}-%{version}%{git_ver}.tar.gz
@@ -174,6 +174,7 @@ cd ../fastfabric
cp -t %{buildroot}%{_sbindir} ${ff_tools_sbin}
cp -t %{buildroot}%{pseudo_opt}tools/ ${ff_tools_misc}
cp -t %{buildroot}%{pseudo_opt}help ${help_doc}
cp -t %{buildroot}%{opasysconfdir} ${basic_configs}
cd ../etc
cp -t %{buildroot}/%{pseudo_opt}fm_tools/ ${ff_tools_fm}
@@ -181,7 +182,7 @@ ln -s %{pseudo_opt}/fm_tools/config_check %{buildroot}%{_sbindir}/opafmconfigche
ln -s %{pseudo_opt}/fm_tools/config_diff %{buildroot}%{_sbindir}/opafmconfigdiff
cd ../fastfabric/samples
cp -t %{buildroot}%{pseudo_opt}samples ${ff_iba_samples}
cp -t %{buildroot}%{pseudo_opt}samples ${ff_iba_samples} ${basic_samples}
cd ..
cd ../fastfabric/tools
@@ -189,7 +190,7 @@ chmod 755 *.exp
cp -t %{buildroot}%{pseudo_opt}tools/ ${ff_tools_exp}
cp -t %{buildroot}%{pseudo_opt}tools/ ${ff_libs_misc}
cp -t %{buildroot}%{pseudo_opt}tools/ osid_wrapper
cp -t %{buildroot}%{opasysconfdir} allhosts chassis esm_chassis hosts ports switches opaff.xml
cp -t %{buildroot}%{opasysconfdir} allhosts chassis esm_chassis hosts ports switches
cd ..
cd ../man/man1
@@ -239,6 +240,10 @@ done
# Extra wildcard to accept .1.gz
echo "%{_mandir}/man1/${file}*"
done
#Basic config pages
for file in ${basic_configs}; do
echo "%config(noreplace) %{opasysconfdir}${file}"
done
) > %{_builddir}/basic_file.list
# List for opa-fastfabric
@@ -264,7 +269,7 @@ done
done
#FF iba samples
for file in ${ff_iba_samples}; do
for file in ${ff_iba_samples} ${basic_samples}; do
echo "%{pseudo_opt}samples/${file}"
done
@@ -301,6 +306,7 @@ done
%defattr(-,root,root,-)
%dir %{pseudo_opt}
%dir %{pseudo_opt}tools/
%dir %{opasysconfdir}
%doc README LICENSE
@@ -313,7 +319,7 @@ done
%dir %{pseudo_opt}tools
%dir %{_sysconfdir}/sysconfig/opa
%{opasysconfdir}
%dir %{opasysconfdir}
/etc/sysconfig/opa/*
%config(noreplace) %{opasysconfdir}/opafastfabric.conf
@@ -324,8 +330,8 @@ done
%config(noreplace) %{opasysconfdir}/hosts
%config(noreplace) %{opasysconfdir}/ports
%config(noreplace) %{opasysconfdir}/switches
%config(noreplace) %{opasysconfdir}/opaff.xml
%config(noreplace) %{opasysconfdir}/opamon.si.conf
%{opasysconfdir}/opamon.si.conf
# Replace opamon.si.conf, as it's a template config file.
%{pseudo_opt}tools/osid_wrapper
%{_sbindir}/opafmconfigcheck
%{_sbindir}/opafmconfigdiff