Re: [PATCH python 5/7] Adapt to rename of py2 RPMs from python- to python2- prefix

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Thu, Jan 11, 2018 at 04:43:37PM +0000, Daniel P. Berrange wrote:
> Signed-off-by: Daniel P. Berrange <berrange@xxxxxxxxxx>
> ---
>  libvirt-python.spec.in | 12 ++++++++++++
>  1 file changed, 12 insertions(+)
> 
> diff --git a/libvirt-python.spec.in b/libvirt-python.spec.in
> index b667ebe..cc5a5a5 100644
> --- a/libvirt-python.spec.in
> +++ b/libvirt-python.spec.in
> @@ -18,6 +18,12 @@
>  %define _with_python3 1
>  %endif
>  
> +# Whether py2 packages are assumed to have python2- name prefix
> +%define py2_versioned_deps 0
> +%if 0%{?fedora} || 0%{?rhel} > 7
> +%define py2_versioned_deps 1
> +%endif
> +
>  %{!?with_python2: %define with_python2 %{_with_python2}}
>  %{!?with_python3: %define with_python3 %{_with_python3}}
>  
> @@ -31,10 +37,16 @@ License: LGPLv2+
>  Group: Development/Libraries
>  BuildRequires: libvirt-devel >= @C_VERSION@
>  %if %{with_python2}
> +%if %{py2_versioned_deps}
> +BuildRequires: python2-devel
> +BuildRequires: pyth2on2-nose

Yes, I will remove this intentional typo i added during testing :-)

> +BuildRequires: python2-lxml
> +%else
>  BuildRequires: python-devel
>  BuildRequires: python-nose
>  BuildRequires: python-lxml
>  %endif
> +%endif
>  %if %{with_python3}
>  BuildRequires: python3-devel
>  BuildRequires: python3-nose
> -- 
> 2.14.3
> 

Regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list



[Index of Archives]     [Virt Tools]     [Libvirt Users]     [Lib OS Info]     [Fedora Users]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [KDE Users]     [Fedora Tools]
  Powered by Linux