From 756b52afe7c1d3711baf3e1a253deb353ccb8a12 Mon Sep 17 00:00:00 2001
From: Open vSwitch CI <ovs-team@redhat.com>
Date: Mar 01 2023 22:36:58 +0000
Subject: Import openvswitch2.15-2.15.0-134 from Fast DataPath


---

diff --git a/SPECS/openvswitch2.15.spec b/SPECS/openvswitch2.15.spec
index 3b5a9c4..5722c41 100644
--- a/SPECS/openvswitch2.15.spec
+++ b/SPECS/openvswitch2.15.spec
@@ -27,6 +27,12 @@
 %define _rundir /run
 %endif
 
+# FIXME remove when fast-datapath-rhel-8 buildroot is updated to new RHEL 8 zstream
+# RHEL-8.0 doesn't define _smp_build_ncpus, but it uses the old _smp_mflags
+%if 0%{!?_smp_build_ncpus:1}
+%define _smp_build_ncpus %(c=%_smp_mflags; echo ${c:2})
+%endif
+
 # FIXME Test "STP - flush the fdb and mdb when topology changed" fails on s390x
 # FIXME 2 tests fails on ppc64le. They will be hopefully fixed before official 2.11
 %ifarch %{ix86} x86_64 aarch64
@@ -57,7 +63,7 @@ Summary: Open vSwitch
 Group: System Environment/Daemons daemon/database/utilities
 URL: http://www.openvswitch.org/
 Version: 2.15.0
-Release: 133%{?dist}
+Release: 134%{?dist}
 
 # Nearly all of openvswitch is ASL 2.0.  The bugtool is LGPLv2+, and the
 # lib/sflow*.[ch] files are SISSL
@@ -702,6 +708,20 @@ exit 0
 %endif
 
 %changelog
+* Wed Mar 01 2023 Timothy Redaelli <tredaelli@redhat.com> - 2.15.0-134
+- redhat: add a workaround for meson [RH git: d4747588b2]
+    Currently, fast-datapath-rhel-8 is aligned to RHEL 8.0, with an
+    exception to use a newer meson version.
+    
+    The problem is that, in the meanwhile, _smp_build_ncpus macros was added
+    (and meson macros uses it).
+    
+    This commit just define, if needed, _smp_build_ncpus by stripping the first 2
+    characters (-j) from _smp_mflags that was present in RHEL 8.0.
+    
+    Signed-off-by: Timothy Redaelli <tredaelli@redhat.com>
+
+
 * Mon Jan 09 2023 Open vSwitch CI <ovs-ci@redhat.com> - 2.15.0-133
 - Merging upstream branch-2.15 [RH git: fc7de3b45a]
     Commit list: