From patchwork Wed Mar 8 16:14:45 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Russell Bryant X-Patchwork-Id: 736605 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3vddsX4ZN3z9sNw for ; Thu, 9 Mar 2017 03:15:12 +1100 (AEDT) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 240AFAB6; Wed, 8 Mar 2017 16:15:11 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@mail.linuxfoundation.org Received: from smtp1.linuxfoundation.org (smtp1.linux-foundation.org [172.17.192.35]) by mail.linuxfoundation.org (Postfix) with ESMTPS id 89993A48 for ; Wed, 8 Mar 2017 16:15:10 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from relay3-d.mail.gandi.net (relay3-d.mail.gandi.net [217.70.183.195]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 5EDB71A0 for ; Wed, 8 Mar 2017 16:15:09 +0000 (UTC) Received: from mfilter29-d.gandi.net (mfilter29-d.gandi.net [217.70.178.160]) by relay3-d.mail.gandi.net (Postfix) with ESMTP id 2A622A80C1 for ; Wed, 8 Mar 2017 17:15:08 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at mfilter29-d.gandi.net Received: from relay3-d.mail.gandi.net ([IPv6:::ffff:217.70.183.195]) by mfilter29-d.gandi.net (mfilter29-d.gandi.net [::ffff:10.0.15.180]) (amavisd-new, port 10024) with ESMTP id nnlNT3dcBLzh for ; Wed, 8 Mar 2017 17:15:06 +0100 (CET) X-Originating-IP: 74.125.82.43 Received: from mail-wm0-f43.google.com (mail-wm0-f43.google.com [74.125.82.43]) (Authenticated sender: russell@ovn.org) by relay3-d.mail.gandi.net (Postfix) with ESMTPSA id 15300A81C7 for ; Wed, 8 Mar 2017 17:15:05 +0100 (CET) Received: by mail-wm0-f43.google.com with SMTP id n11so118899590wma.1 for ; Wed, 08 Mar 2017 08:15:05 -0800 (PST) X-Gm-Message-State: AMke39luy9NbzKcTEwTx+AMmqpc/E5gyVFgrb0PClHVmoOxTkKBUf48rWuKubYOPURnq2rKT5jjEhnmFherlJA== X-Received: by 10.28.1.68 with SMTP id 65mr6411062wmb.63.1488989705563; Wed, 08 Mar 2017 08:15:05 -0800 (PST) MIME-Version: 1.0 Received: by 10.80.173.137 with HTTP; Wed, 8 Mar 2017 08:14:45 -0800 (PST) In-Reply-To: <20170306204643.24550-1-lmadsen@redhat.com> References: <20170306204643.24550-1-lmadsen@redhat.com> From: Russell Bryant Date: Wed, 8 Mar 2017 11:14:45 -0500 X-Gmail-Original-Message-ID: Message-ID: To: Leif Madsen X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,HTML_MESSAGE, RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org X-Content-Filtered-By: Mailman/MimeDel 2.1.12 Cc: ovs dev Subject: Re: [ovs-dev] [PATCH v3] packaging: Make Fedora spec file CentOS compatible X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: ovs-dev-bounces@openvswitch.org Errors-To: ovs-dev-bounces@openvswitch.org On Mon, Mar 6, 2017 at 3:46 PM, Leif Madsen 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 > --- > 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@baymicrosystems.com Lance Richardson lrichard@redhat.com Lars Kellogg-Stedman lars@redhat.com Lei Huang huang.f.lei@gmail.com +Leif Madsen lmadsen@redhat.com Leo Alterman lalterman@nicira.com Lilijun jerry.lilijun@huawei.com Linda Sun lsun@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 -- Update compatibility issues with building Python 2 and 3 submodules * Wed Jan 12 2011 Ralf Spenneberg - First build on F14