From 15c03ca84ab51c844e3879a02cf3d7d7f4833028 Mon Sep 17 00:00:00 2001
From: Honggang Li <honli@redhat.com>
Date: Mar 16 2018 10:24:49 +0000
Subject: Add Buildrequires: gcc, gcc-c++


Fix a bug in ibis Makefile.in
Add script ibdev2netdev
Resolves: bz1556746

Signed-off-by: Honggang Li <honli@redhat.com>

---

diff --git a/ibutils.spec b/ibutils.spec
index ff02213..98a613f 100644
--- a/ibutils.spec
+++ b/ibutils.spec
@@ -21,7 +21,7 @@
 Summary: OpenIB Mellanox InfiniBand Diagnostic Tools
 Name: ibutils
 Version: 1.5.7
-Release: 26%{?dist}
+Release: 27%{?dist}
 # This is dual-licensed upstream, all code available under either license
 License: GPLv2 or BSD
 Url: https://www.openfabrics.org/
@@ -29,6 +29,7 @@ Group: System Environment/Libraries
 Source0: https://www.openfabrics.org/downloads/%{name}/%{name}-%{version}-0.2.gbd7e502.tar.gz
 Patch0: ibutils-1.5.7-tk86.patch
 Patch1: ibutils-1.5.7-format-security.patch
+Patch2: add-ibdev2netdev.patch
 Requires: tcl, tk, graphviz-tcl
 Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 
@@ -44,6 +45,7 @@ BuildRequires: chrpath
 BuildRequires: perl-podlators
 BuildRequires: autoconf, automake, libtool
 BuildRequires: libstdc++-devel
+BuildRequires: gcc, gcc-c++
 # RDMA is not currently built on 32-bit ARM: #1484155
 ExcludeArch:   s390 s390x %{arm}
 
@@ -75,9 +77,11 @@ Static libraries from the Mellanox Infiniband diagnostic utilities
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2
 
 autoreconf -fiv -I config
 sed -i "s/^libibmscli_la_LIBADD =/& -lpthread/" ibmgtsim/src/Makefile.in
+sed -e 's#all-am: Makefile $(PROGRAMS) $(LIBRARIES) $(LTLIBRARIES)#all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) $(PROGRAMS)#' -i ibis/src/Makefile.in
 %configure --with-osm=%{_prefix} --enable-ibmgtsim --disable-rpath CXXFLAGS="$CXXFLAGS -fno-strict-aliasing -fPIC -std=c++03"
 # Workaround libtool reordering -Wl,--as-needed after all the libraries.
 sed -e 's|^LTCC="gcc"|LTCC="gcc -Wl,--as-needed"|' \
@@ -99,7 +103,7 @@ find %{buildroot} -name \*.la -delete
 chrpath -d %{buildroot}%{_bindir}/ib{mssh,nlparse,dmsh,topodiff,is,msquit,dmtr,dmchk}
 chrpath -d %{buildroot}%{_libdir}/libib{sysapi,dm}.so.1.[01].[01]
 chrpath -d %{buildroot}%{_libdir}/*/libib{dm,is}.so.%{version}
-
+install -m 0755 ibdev2netdev %{buildroot}%{_bindir}
 
 %post libs -p /sbin/ldconfig
 
@@ -122,6 +126,7 @@ chrpath -d %{buildroot}%{_libdir}/*/libib{dm,is}.so.%{version}
 %{_bindir}/ibmsquit
 %{_bindir}/RunSimTest
 %{_bindir}/IBMgtSim
+%{_bindir}/ibdev2netdev
 %{_datadir}/ibmgtsim
 %{_mandir}/*/*
 
@@ -154,6 +159,12 @@ chrpath -d %{buildroot}%{_libdir}/*/libib{dm,is}.so.%{version}
 %{_libdir}/*.a
 
 %changelog
+* Fri Mar 16 2018 Honggang Li <honli@redhat.com> - 1.5.7-27
+- Add Buildrequires: gcc, gcc-c++
+- Fix a bug in ibis Makefile.in
+- Add script ibdev2netdev
+- Resolves: bz1556746
+
 * Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.7-26
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild