From 955b619bc7139d2300ee4b53208f0e1d0ddc5762 Mon Sep 17 00:00:00 2001
From: Open vSwitch CI <ovs-team@redhat.com>
Date: Aug 04 2023 16:00:43 +0000
Subject: Import openvswitch3.1-3.1.0-47 from Fast DataPath


---

diff --git a/SOURCES/openvswitch-3.1.0.patch b/SOURCES/openvswitch-3.1.0.patch
index ed752bb..3d65485 100644
--- a/SOURCES/openvswitch-3.1.0.patch
+++ b/SOURCES/openvswitch-3.1.0.patch
@@ -183,6 +183,19 @@ index f414a879c..c28b6819a 100755
  
  # Install python test dependencies
  pip3 install -r python/test_requirements.txt
+diff --git a/.ci/osx-build.sh b/.ci/osx-build.sh
+index 09df61826..b81744ec9 100755
+--- a/.ci/osx-build.sh
++++ b/.ci/osx-build.sh
+@@ -10,7 +10,7 @@ function configure_ovs()
+     ./boot.sh && ./configure $*
+ }
+ 
+-configure_ovs $EXTRA_OPTS $*
++configure_ovs $EXTRA_OPTS $OPTS $*
+ 
+ if [ "$CC" = "clang" ]; then
+     make CFLAGS="$CFLAGS -Wno-error=unused-command-line-argument"
 diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
 index 82675b973..8e71b9533 100644
 --- a/.github/workflows/build-and-test.yml
diff --git a/SPECS/openvswitch3.1.spec b/SPECS/openvswitch3.1.spec
index f1c9f9a..80b522b 100644
--- a/SPECS/openvswitch3.1.spec
+++ b/SPECS/openvswitch3.1.spec
@@ -63,7 +63,7 @@ Summary: Open vSwitch
 Group: System Environment/Daemons daemon/database/utilities
 URL: http://www.openvswitch.org/
 Version: 3.1.0
-Release: 46%{?dist}
+Release: 47%{?dist}
 
 # Nearly all of openvswitch is ASL 2.0.  The bugtool is LGPLv2+, and the
 # lib/sflow*.[ch] files are SISSL
@@ -757,6 +757,12 @@ exit 0
 %endif
 
 %changelog
+* Fri Aug 04 2023 Open vSwitch CI <ovs-ci@redhat.com> - 3.1.0-47
+- Merging upstream branch-3.1 [RH git: 06de042cba]
+    Commit list:
+    27296cf482 ci: Fix OPTS not being passed to OSX builds.
+
+
 * Thu Aug 03 2023 Open vSwitch CI <ovs-ci@redhat.com> - 3.1.0-46
 - Merging upstream branch-3.1 [RH git: ab94f613c7]
     Commit list: