From 60f75e00f3c4ecbd276089e3f7385500bc9be0af Mon Sep 17 00:00:00 2001
From: Flavio Leitner <fbl@redhat.com>
Date: Sat, 14 Sep 2019 20:21:42 -0300
Subject: [PATCH] Updated to 2.12.0

---
 .gitignore                |  1 +
 openvswitch.spec          | 17 +++++++++++------
 python3-dict-change.patch | 13 +++++++++++++
 sources                   |  2 +-
 4 files changed, 26 insertions(+), 7 deletions(-)
 create mode 100644 python3-dict-change.patch

diff --git a/.gitignore b/.gitignore
index 6d75081..06a49e1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,3 +36,4 @@
 /openvswitch-2.10.1.tar.gz
 /openvswitch-2.11.0.tar.gz
 /openvswitch-2.11.1.tar.gz
+/openvswitch-2.12.0.tar.gz
diff --git a/openvswitch.spec b/openvswitch.spec
index c0652a5..55fee25 100644
--- a/openvswitch.spec
+++ b/openvswitch.spec
@@ -35,15 +35,14 @@
 # option to build with libcap-ng, needed for running OVS as regular user
 %bcond_without libcapng
 
-# Build python2 (that provides python) and python3 subpackages on Fedora
-# Build only python3 (that provides python) subpackage on RHEL8
+# Build only python3 (that provides python) subpackage on RHEL8 and Fedora
 # Build only python subpackage on RHEL7
 %if 0%{?rhel} > 7 || 0%{?fedora}
 # Use Python3
 %global _py python3
 %global _py2 python2
 %global with_python3 1
-%if 0%{?fedora}
+%if 0%{?fedora} < 31
 %global with_python2 1
 # Bug #1701921
 %global __requires_exclude ^python2\\.7dist\\(sortedcontainers\\)$
@@ -66,8 +65,8 @@ Epoch:   1
 Name: openvswitch
 Summary: Open vSwitch daemon/database/utilities
 URL: http://www.openvswitch.org/
-Version: 2.11.1
-Release: 4%{?commit0:.%{date}git%{shortcommit0}}%{?dist}
+Version: 2.12.0
+Release: 1%{?commit0:.%{date}git%{shortcommit0}}%{?dist}
 
 # Nearly all of openvswitch is ASL 2.0.  The bugtool is LGPLv2+, and the
 # lib/sflow*.[ch] files are SISSL
@@ -86,6 +85,7 @@ Source: http://openvswitch.org/releases/%{name}-%{version}.tar.gz
 # ovs-patches
 
 # OVS (including OVN) backports (0 - 300)
+Patch001: python3-dict-change.patch
 
 BuildRequires: gcc gcc-c++ make
 BuildRequires: autoconf automake libtool
@@ -242,7 +242,9 @@ sed -i.old -e "s/^AC_INIT(openvswitch,.*,/AC_INIT(openvswitch, %{version},/" con
 %endif
 
 ./boot.sh
-
+%if ! %{with_python2}
+    export PYTHON2=no
+%endif
 %configure \
 %if %{with libcapng}
         --enable-libcapng \
@@ -569,6 +571,9 @@ chown -R openvswitch:openvswitch /etc/openvswitch
 %endif
 
 %changelog
+* Tue Sep 10 2019 Flavio Leitner <fbl@redhat.com> - 2.12.0-1
+- Updated to 2.12.0
+
 * Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 2.11.1-4
 - Rebuilt for Python 3.8
 
diff --git a/python3-dict-change.patch b/python3-dict-change.patch
new file mode 100644
index 0000000..9d9c47d
--- /dev/null
+++ b/python3-dict-change.patch
@@ -0,0 +1,13 @@
+diff --git a/ovsdb/ovsdb-idlc.in b/ovsdb/ovsdb-idlc.in
+index 40fef39ed..22d0a4e22 100755
+--- a/ovsdb/ovsdb-idlc.in
++++ b/ovsdb/ovsdb-idlc.in
+@@ -176,7 +176,7 @@ def replace_cplusplus_keyword(schema):
+                 'wchar_t', 'while', 'xor', 'xor_eq'}
+ 
+     for tableName, table in schema.tables.items():
+-        for columnName in table.columns:
++        for columnName in list(table.columns):
+             if columnName in keywords:
+                 table.columns[columnName + '_'] = table.columns.pop(columnName)
+ 
diff --git a/sources b/sources
index 2c99b7a..1d489bd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (openvswitch-2.11.1.tar.gz) = de016a1acfbae34d2062f4ac23b9b0782016fef4c0575b2714435380439f19613881173fb2c876afe86317a5c0327908704e540322d80f9f7da9f59bea7b1789
+SHA512 (openvswitch-2.12.0.tar.gz) = e9bf9030a1c5dbcddcf463d332a87c84326c21fb53eac743cd999da9e03f564a394e2362fe5ab2ebec35bb456fc76e10da6910c398886b41fbd28a35465b5aee