From 073c5818f62b2b09ee8de342146fc7938e33c835 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Tue, 21 Jan 2020 18:16:01 -0500
Subject: [PATCH] import opa-fm-10.10.0.0.444-2.el8

---
 .gitignore        |  2 +-
 .opa-fm.metadata  |  2 +-
 SPECS/opa-fm.spec | 23 ++++++++++++++++-------
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index 2303fa3..fd106fc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/opa-fm-10.9.2.2.1.tar.xz
+SOURCES/opa-fm-10.10.0.0.444.tar.xz
diff --git a/.opa-fm.metadata b/.opa-fm.metadata
index 78899c6..3f5adf2 100644
--- a/.opa-fm.metadata
+++ b/.opa-fm.metadata
@@ -1 +1 @@
-60fd1b4b0887ddedd8294027fa6909d6138502e8 SOURCES/opa-fm-10.9.2.2.1.tar.xz
+292f6a3b2e639aa40c7191b92e19346938926d41 SOURCES/opa-fm-10.10.0.0.444.tar.xz
diff --git a/SPECS/opa-fm.spec b/SPECS/opa-fm.spec
index a522239..e6e6398 100644
--- a/SPECS/opa-fm.spec
+++ b/SPECS/opa-fm.spec
@@ -1,7 +1,7 @@
 Name: opa-fm
 Epoch: 1
-Version: 10.9.2.2.1
-Release: 1%{?dist}
+Version: 10.10.0.0.444
+Release: 2%{?dist}
 Summary: Intel Omni-Path Fabric Management Software
 
 Group: System Environment/Daemons
@@ -11,7 +11,7 @@ Url: https://github.com/intel/opa-fm
 # git clone https://github.com/intel/opa-fm.git
 # cd opa-fm
 # git archive --format=tar --prefix=opa-fm-%{version}/ \
-# 18110638b7a54e66b1b5ad702db6aad1f536fa55 | xz > opa-fm-%{version}.tar.xz
+# 939def4d214d4e0f4860990758be7058afe0f9bf | xz > opa-fm-%{version}.tar.xz
 Source0: %{name}-%{version}.tar.xz
 
 # bz1262327 needs Patch0002
@@ -44,12 +44,13 @@ Fabric Executive, and some fabric management tools.
 
 # Make it possible to override hardcoded compiler flags
 sed -i -r -e 's/(release_C(C)?OPT_Flags\s*)=/\1?=/' Makerules/Target.LINUX.GNU.*
+sed -r -e 's/(^COPT\s*=\s*)/#\1/' -i Esm/ib/src/linux/opafmvf/Makefile
 
 %build
-export CFLAGS='%{optflags}'
-export CXXFLAGS='%{optflags}'
-export release_COPT_Flags='%{optflags}'
-export release_CCOPT_Flags='%{optflags}'
+export CFLAGS='%{optflags} -std=gnu11'
+export CXXFLAGS='%{optflags} -std=gnu11'
+export release_COPT_Flags='%{optflags} -std=gnu11'
+export release_CCOPT_Flags='%{optflags} -std=gnu11'
 cd Esm
 OPA_FEATURE_SET= ./fmbuild $BUILD_ARGS
 
@@ -84,6 +85,14 @@ chmod a-x %{buildroot}/%{_prefix}/share/opa-fm/opafm_src.xml
 %{_mandir}/man8/*
 
 %changelog
+* Tue Dec 03 2019 Honggang Li <honli@redhat.com> - 10.10.0.0.444-2
+- Override hard-coded CFLAGS for opafmvf
+- Resolves bz1778557
+
+* Thu Oct 31 2019 Honggang Li <honli@redhat.com> - 10.10.0.0.444-1
+- Rebase to upstream release 10.10.0.0.444
+- Resolves:bz1719674
+
 * Tue Jun 11 2019 Honggang Li <honli@redhat.com> - 10.9.2.2.1-1
 - Rebase to upstream release 10.9.2.2.1
 - Resolves: bz1660617