[ovs-dev,2/6] redhat: replace python3 with python package macro

According to the packaging guidelines found at
https://fedoraproject.org/wiki/PackagingDrafts:Python3EPEL, when
specifying a python3 package, use the %{python3_pkgversion} macro to get
the appropriate suffix.

Fixes: db8dcbaf1c57 ("packaging: Make Fedora spec file CentOS compatible")
CC: Leif Madsen <lmadsen@redhat.com>
CC: Timothy Redaelli <tredaelli@redhat.com>
Signed-off-by: Aaron Conole <aconole@redhat.com>
---
 rhel/openvswitch-fedora.spec.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

On Sat, Jun 03, 2017 at 11:09:57AM -0400, Aaron Conole wrote:
> According to the packaging guidelines found at
> https://fedoraproject.org/wiki/PackagingDrafts:Python3EPEL, when
> specifying a python3 package, use the %{python3_pkgversion} macro to get
> the appropriate suffix.

This looks incomplete because the package's name remains python3-openvswitch
where it should have been python%{python3_pkgversion}-openvswitch.
Same issue with the requires for that subpackage.

Thanks,
fbl
 
> Fixes: db8dcbaf1c57 ("packaging: Make Fedora spec file CentOS compatible")
> CC: Leif Madsen <lmadsen@redhat.com>
> CC: Timothy Redaelli <tredaelli@redhat.com>
> Signed-off-by: Aaron Conole <aconole@redhat.com>
> ---
>  rhel/openvswitch-fedora.spec.in | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/rhel/openvswitch-fedora.spec.in b/rhel/openvswitch-fedora.spec.in
> index 9fc5f27..95533aa 100644
> --- a/rhel/openvswitch-fedora.spec.in
> +++ b/rhel/openvswitch-fedora.spec.in
> @@ -132,7 +132,7 @@ License: ASL 2.0
>  BuildArch: noarch
>  Requires: python3
>  Requires: python3-six
> -%{?python_provide:%python_provide python3-openvswitch = %{version}-%{release}}
> +%{?python_provide:%python_provide python%{python3_pkgversion}-openvswitch = %{version}-%{release}}
>  
>  %description -n python3-openvswitch
>  Python bindings for the Open vSwitch database
> -- 
> 2.9.4
> 
> _______________________________________________
> dev mailing list
> dev@openvswitch.org
> https://mail.openvswitch.org/mailman/listinfo/ovs-dev

Flavio Leitner <fbl@sysclose.org> writes:

> On Sat, Jun 03, 2017 at 11:09:57AM -0400, Aaron Conole wrote:
>> According to the packaging guidelines found at
>> https://fedoraproject.org/wiki/PackagingDrafts:Python3EPEL, when
>> specifying a python3 package, use the %{python3_pkgversion} macro to get
>> the appropriate suffix.
>
> This looks incomplete because the package's name remains python3-openvswitch
> where it should have been python%{python3_pkgversion}-openvswitch.
> Same issue with the requires for that subpackage.

Makes sense.  I'll fix it up, and test.

Thanks Flavio!

> Thanks,
> fbl
>  
>> Fixes: db8dcbaf1c57 ("packaging: Make Fedora spec file CentOS compatible")
>> CC: Leif Madsen <lmadsen@redhat.com>
>> CC: Timothy Redaelli <tredaelli@redhat.com>
>> Signed-off-by: Aaron Conole <aconole@redhat.com>
>> ---
>>  rhel/openvswitch-fedora.spec.in | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>> 
>> diff --git a/rhel/openvswitch-fedora.spec.in b/rhel/openvswitch-fedora.spec.in
>> index 9fc5f27..95533aa 100644
>> --- a/rhel/openvswitch-fedora.spec.in
>> +++ b/rhel/openvswitch-fedora.spec.in
>> @@ -132,7 +132,7 @@ License: ASL 2.0
>>  BuildArch: noarch
>>  Requires: python3
>>  Requires: python3-six
>> -%{?python_provide:%python_provide python3-openvswitch = %{version}-%{release}}
>> +%{?python_provide:%python_provide
>> python%{python3_pkgversion}-openvswitch = %{version}-%{release}}
>>  
>>  %description -n python3-openvswitch
>>  Python bindings for the Open vSwitch database
>> -- 
>> 2.9.4
>> 
>> _______________________________________________
>> dev mailing list
>> dev@openvswitch.org
>> https://mail.openvswitch.org/mailman/listinfo/ovs-dev

On Wed, Jun 07, 2017 at 05:39:28PM -0300, Flavio Leitner wrote:
> On Sat, Jun 03, 2017 at 11:09:57AM -0400, Aaron Conole wrote:
> > diff --git a/rhel/openvswitch-fedora.spec.in b/rhel/openvswitch-fedora.spec.in
> > index 9fc5f27..95533aa 100644
> > --- a/rhel/openvswitch-fedora.spec.in
> > +++ b/rhel/openvswitch-fedora.spec.in
> > @@ -132,7 +132,7 @@ License: ASL 2.0
> >  BuildArch: noarch
> >  Requires: python3

Instead of fixing the above requires, it could be removed as it seems
to be not necessary. The rpm will add a requires to a python abi of a
specific version:

This is the package from master, note the requires for the abi version:
$ rpm -qp --requires ovs/rpm/rpmbuild/RPMS/noarch/python3-openvswitch-2.7.90-1.fc25.noarch.rpm
python(abi) = 3.5    <----
python3
python3-six

And this is the package providing it.
$ rpm -q --provides python3-3.5.3-6.fc25.x86_64 | grep abi
python(abi) = 3.5

Aaron Conole <aconole@redhat.com> writes:

> Flavio Leitner <fbl@sysclose.org> writes:
>
>> On Sat, Jun 03, 2017 at 11:09:57AM -0400, Aaron Conole wrote:
>>> According to the packaging guidelines found at
>>> https://fedoraproject.org/wiki/PackagingDrafts:Python3EPEL, when
>>> specifying a python3 package, use the %{python3_pkgversion} macro to get
>>> the appropriate suffix.
>>
>> This looks incomplete because the package's name remains python3-openvswitch
>> where it should have been python%{python3_pkgversion}-openvswitch.
>> Same issue with the requires for that subpackage.
>
> Makes sense.  I'll fix it up, and test.
>
> Thanks Flavio!
>

With a clean Fedora system, I don't see the error that I was getting
that led me to change this.

Additionally, some asking around has led me to understand
that those guidelines are for EPEL packages (openvswitch is not an EPEL
package).  And it seems like they may not even be current.

I'm going to drop this patch from my submission.  Sorry for the noise.

-Aaron