[ovs-dev] [PATCH v3] packaging: Make Fedora spec file CentOS compatible

Russell Bryant russell at ovn.org
Wed Mar 8 16:14:45 UTC 2017


On Mon, Mar 6, 2017 at 3:46 PM, Leif Madsen <lmadsen at redhat.com> wrote:

> On CentOS, the package names aren't prefixed with python2, but rather
> are prefixed with simply python. This change addresses that and fixes
> up some documentation that was outdated, and updates the Vagrantfile
> to use the proper spec file and package names.
>

I added a Fixes header to the commit message:

Fixes: bb1a7ca21107 ("fedora: Add python3-openvswitch split package")


> Signed-off-by: Leif Madsen <lmadsen at redhat.com>
> ---
>  Documentation/intro/install/fedora.rst |  4 +--
>  Vagrantfile                            |  6 ++--
>  rhel/openvswitch-fedora.spec.in        | 54
> ++++++++++++++++++++++++----------
>  3 files changed, 44 insertions(+), 20 deletions(-)


Thanks for the patch!  I applied this to master and branch-2.7 with the
following incremental changes.

diff --git a/AUTHORS.rst b/AUTHORS.rst
index 39a5f40..bc06f3a 100644
--- a/AUTHORS.rst
+++ b/AUTHORS.rst
@@ -183,6 +183,7 @@ Kyle Upton
kupton at baymicrosystems.com
 Lance Richardson                lrichard at redhat.com
 Lars Kellogg-Stedman            lars at redhat.com
 Lei Huang                       huang.f.lei at gmail.com
+Leif Madsen                     lmadsen at redhat.com
 Leo Alterman                    lalterman at nicira.com
 Lilijun                         jerry.lilijun at huawei.com
 Linda Sun                       lsun at vmware.com
diff --git a/rhel/openvswitch-fedora.spec.in b/rhel/
openvswitch-fedora.spec.in
index 09d4f37..2d14660 100644
--- a/rhel/openvswitch-fedora.spec.in
+++ b/rhel/openvswitch-fedora.spec.in
@@ -28,7 +28,9 @@
 %bcond_without libcapng
 # To enable DPDK support, specify '--with dpdk' when building
 %bcond_with dpdk
-# Enable Python 3 building when distribution not default supported
+# Enable Python 3 by specifying '--with build_python3'.
+# This is enabled by default for versions of the distribution that
+# have Python 3 by default (Fedora > 22).
 %bcond_with build_python3

 # Enable PIE, bz#955181
@@ -584,7 +586,5 @@ fi
 %{_unitdir}/ovn-controller-vtep.service

 %changelog
-* Mon Mar 06 2017 Leif Madsen <lmadsen at redhat.com>
-- Update compatibility issues with building Python 2 and 3 submodules
 * Wed Jan 12 2011 Ralf Spenneberg <ralf at os-s.net>
 - First build on F14


More information about the dev mailing list