Updated to 2.13.0

.gitignore

@@ -37,3 +37,4 @@
 /openvswitch-2.11.0.tar.gz
 /openvswitch-2.11.1.tar.gz
 /openvswitch-2.12.0.tar.gz
+/openvswitch-2.13.0.tar.gz

openvswitch.spec

@@ -35,27 +35,6 @@
 # option to build with libcap-ng, needed for running OVS as regular user
 %bcond_without libcapng
 
-# 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} < 31
-%global with_python2 1
-# Bug #1701921
-%global __requires_exclude ^python2\\.7dist\\(sortedcontainers\\)$
-%else
-%global with_python2 0
-%endif
-%else
-# Use Python2
-%global _py python
-%global _py2 python
-%global with_python2 1
-%global with_python3 0
-%endif
 
 %if 0%{?centos} == 7
 # Carried over from 2.6.1 CBS builds, introduced to win over 2.6.90
@@ -65,8 +44,8 @@ Epoch:   1
 Name: openvswitch
 Summary: Open vSwitch daemon/database/utilities
 URL: http://www.openvswitch.org/
-Version: 2.12.0
+Version: 2.13.0
-Release: 2%{?commit0:.%{date}git%{shortcommit0}}%{?dist}
+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
@@ -85,28 +64,21 @@ 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
 BuildRequires: systemd-units openssl openssl-devel
-%if %{with_python3}
 BuildRequires: python3-devel python3-six python3-setuptools
-%endif
+BuildRequires: python3-sphinx
-%if %{with_python2}
-BuildRequires: %{_py2}-devel %{_py2}-six %{_py2}-setuptools
-%endif
-BuildRequires: %{_py}-sphinx
 BuildRequires: desktop-file-utils
 BuildRequires: groff-base graphviz
 BuildRequires: unbound-devel
 # make check dependencies
 BuildRequires: procps-ng
-%if %{with_python2}
+%if 0%{?rhel} > 7 || 0%{?fedora}
-BuildRequires: pyOpenSSL
-%else
 BuildRequires: python3-pyOpenSSL
 %endif
+
 %if %{with check_datapath_kernel}
 BuildRequires: nmap-ncat
 # would be useful but not available in RHEL or EPEL
@@ -148,48 +120,21 @@ Open vSwitch provides standard network bridging functions and
 support for the OpenFlow protocol for remote per-flow control of
 traffic.
 
-%if %{with_python2}
-%package -n %{_py2}-openvswitch
-Summary: Open vSwitch python2 bindings
-License: ASL 2.0
-Requires: %{_py2} %{_py2}-six
-%if "%{_py2}" == "python2"
-Obsoletes: python-openvswitch < 2.6.1-2
-Provides: python-openvswitch = %{?epoch:%{epoch}:}%{version}-%{release}
-%endif
-%if 0%{?centos} == 7
-Obsoletes: python2-openvswitch
-Provides: python2-openvswitch = %{?epoch:%{epoch}:}%{version}-%{release}
-%endif
-
-%description -n %{_py2}-openvswitch
-Python bindings for the Open vSwitch database
-%endif
-
-%if %{with_python3}
 %package -n python3-openvswitch
 Summary: Open vSwitch python3 bindings
 License: ASL 2.0
 Requires: python3 python3-six
-%if ! %{with_python2}
 Obsoletes: python-openvswitch < 2.10.0-6
 Provides: python-openvswitch = %{?epoch:%{epoch}:}%{version}-%{release}
-%endif
 
 %description -n python3-openvswitch
 Python bindings for the Open vSwitch database
-%endif
 
 %package test
 Summary: Open vSwitch testing utilities
 License: ASL 2.0
 BuildArch: noarch
-%if %{with_python2}
-Requires: %{_py2}-openvswitch = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: %{_py2} %{_py2}-twisted%{?rhel:-web}
-%else
 Requires: python3-openvswitch = %{?epoch:%{epoch}:}%{version}-%{release}
-%endif
 
 %description test
 Utilities that are useful to diagnose performance and connectivity
@@ -219,11 +164,7 @@ service.
 Summary: Open vSwitch IPsec tunneling support
 License: ASL 2.0
 Requires: openvswitch libreswan
-%if %{with_python2}
-Requires: %{_py2}-openvswitch = %{?epoch:%{epoch}:}%{version}-%{release}
-%else
 Requires: python3-openvswitch = %{?epoch:%{epoch}:}%{version}-%{release}
-%endif
 
 %description ipsec
 This package provides IPsec tunneling support for OVS tunnels.
@@ -242,9 +183,6 @@ 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 \
@@ -261,7 +199,7 @@ sed -i.old -e "s/^AC_INIT(openvswitch,.*,/AC_INIT(openvswitch, %{version},/" con
 %endif
   --with-pkidir=%{_sharedstatedir}/openvswitch/pki
 
-/usr/bin/%{_py} build-aux/dpdkstrip.py \
+/usr/bin/python3 build-aux/dpdkstrip.py \
         --dpdk \
         < rhel/usr_lib_systemd_system_ovs-vswitchd.service.in \
         > rhel/usr_lib_systemd_system_ovs-vswitchd.service
@@ -307,28 +245,12 @@ install -p -m 0755 rhel/etc_sysconfig_network-scripts_ifdown-ovs \
 install -p -m 0755 rhel/etc_sysconfig_network-scripts_ifup-ovs \
         $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/network-scripts/ifup-ovs
 
-%if %{with_python2}
-install -d -m 0755 $RPM_BUILD_ROOT%{python_sitelib}
-cp -a $RPM_BUILD_ROOT/%{_datadir}/openvswitch/python/ovstest \
-        $RPM_BUILD_ROOT%{python_sitelib}
-%else
 install -d -m 0755 $RPM_BUILD_ROOT%{python3_sitelib}
 cp -a $RPM_BUILD_ROOT/%{_datadir}/openvswitch/python/ovstest \
         $RPM_BUILD_ROOT%{python3_sitelib}
-%endif
 
 # Build the JSON C extension for the Python lib (#1417738)
 pushd python
-%if %{with_python2}
-(
-export CPPFLAGS="-I ../include"
-export LDFLAGS="%{__global_ldflags} -L $RPM_BUILD_ROOT%{_libdir}"
-%py2_build
-%py2_install
-[ -f "$RPM_BUILD_ROOT/%{python2_sitearch}/ovs/_json.so" ]
-)
-%endif
-%if %{with_python3}
 (
 export CPPFLAGS="-I ../include"
 export LDFLAGS="%{__global_ldflags} -L $RPM_BUILD_ROOT%{_libdir}"
@@ -336,7 +258,6 @@ export LDFLAGS="%{__global_ldflags} -L $RPM_BUILD_ROOT%{_libdir}"
 %py3_install
 [ -f "$RPM_BUILD_ROOT/%{python3_sitearch}/ovs/_json.cpython-%{python3_version_nodots}$(python3-config --abiflags)-%{_arch}-%{_target_os}%{?_gnu}.so" ]
 )
-%endif
 popd
 
 rm -rf $RPM_BUILD_ROOT/%{_datadir}/openvswitch/python/
@@ -439,19 +360,10 @@ chown -R openvswitch:openvswitch /etc/openvswitch
 %endif
 
 
-%if %{with_python2}
-%files -n %{_py2}-openvswitch
-%{python2_sitearch}/ovs
-%{python2_sitearch}/ovs-*.egg-info
-%doc LICENSE
-%endif
-
-%if %{with_python3}
 %files -n python3-openvswitch
 %{python3_sitearch}/ovs
 %{python3_sitearch}/ovs-*.egg-info
 %doc LICENSE
-%endif
 
 %files test
 %{_bindir}/ovs-pcap
@@ -460,7 +372,6 @@ chown -R openvswitch:openvswitch /etc/openvswitch
 %{_mandir}/man1/ovs-pcap.1*
 %{_mandir}/man8/ovs-tcpdump.8*
 %{_mandir}/man1/ovs-tcpundump.1*
-%if %{with_python2}
 %{_bindir}/ovs-test
 %{_bindir}/ovs-vlan-test
 %{_bindir}/ovs-l3ping
@@ -468,12 +379,6 @@ chown -R openvswitch:openvswitch /etc/openvswitch
 %{_mandir}/man8/ovs-vlan-test.8*
 %{_mandir}/man8/ovs-l3ping.8*
 %{python_sitelib}/ovstest
-%else
-%exclude %{_mandir}/man8/ovs-test.8*
-%exclude %{_mandir}/man8/ovs-vlan-test.8*
-%exclude %{_mandir}/man8/ovs-l3ping.8*
-%{python3_sitelib}/ovstest
-%endif
 
 %files devel
 %{_libdir}/*.so
@@ -555,22 +460,21 @@ chown -R openvswitch:openvswitch /etc/openvswitch
 /var/lib/openvswitch
 %attr(750,openvswitch,openvswitch) /var/log/openvswitch
 %ghost %attr(755,root,root) %verify(not owner group) %{_rundir}/openvswitch
-%if %{with_python2}
 %{_datadir}/openvswitch/bugtool-plugins/
 %{_datadir}/openvswitch/scripts/ovs-bugtool-*
 %{_bindir}/ovs-dpctl-top
 %{_sbindir}/ovs-bugtool
 %{_mandir}/man8/ovs-dpctl-top.8*
 %{_mandir}/man8/ovs-bugtool.8*
-%else
-%exclude %{_mandir}/man8/ovs-dpctl-top.8*
-%endif
 %if (0%{?rhel} && 0%{?rhel} <= 7) || (0%{?fedora} && 0%{?fedora} < 29)
 %{_sysconfdir}/sysconfig/network-scripts/ifup-ovs
 %{_sysconfdir}/sysconfig/network-scripts/ifdown-ovs
 %endif
 
 %changelog
+* Tue Apr 07 2020 Timothy Redaelli <tredaelli@redhat.com> - 2.13.0-1
+- Updated to 2.13.0
+
 * Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.12.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 

python3-dict-change.patch

@@ -1,13 +0,0 @@
-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)
- 

sources

@@ -1 +1 @@
-SHA512 (openvswitch-2.12.0.tar.gz) = e9bf9030a1c5dbcddcf463d332a87c84326c21fb53eac743cd999da9e03f564a394e2362fe5ab2ebec35bb456fc76e10da6910c398886b41fbd28a35465b5aee
+SHA512 (openvswitch-2.13.0.tar.gz) = 3fcd15d07925273e0c45e6b1e70b2cd9998f753e8d1a11fd0de1d1511ad56dfddedbba436bb1c347b4afb84eb9cd6fc52c3d445b710a89d599d2ff47ed46f17c