[libvirt] [PATCH python] rpm: assume python3 is always available
Signed-off-by: Daniel P. Berrange <berrange@redhat.com> --- libvirt-python.spec.in | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/libvirt-python.spec.in b/libvirt-python.spec.in index fc30564..ed9f2bd 100644 --- a/libvirt-python.spec.in +++ b/libvirt-python.spec.in @@ -1,9 +1,4 @@ -%define with_python3 0 -%if 0%{?fedora} > 18 -%define with_python3 1 -%endif - Summary: The libvirt virtualization API python2 binding Name: libvirt-python Version: @PY_VERSION@ @@ -16,11 +11,9 @@ BuildRequires: libvirt-devel >= @C_VERSION@ BuildRequires: python-devel BuildRequires: python-nose BuildRequires: python-lxml -%if %{with_python3} BuildRequires: python3-devel BuildRequires: python3-nose BuildRequires: python3-lxml -%endif # Don't want provides for python shared objects %{?filter_provides_in: %filter_provides_in %{python_sitearch}/.*\.so} @@ -32,7 +25,6 @@ written in the Python programming language to use the interface supplied by the libvirt library to use the virtualization capabilities of recent versions of Linux (and other OSes). -%if %{with_python3} %package -n libvirt-python3 Summary: The libvirt virtualization API python3 binding Url: http://libvirt.org @@ -44,7 +36,6 @@ The libvirt-python package contains a module that permits applications written in the Python programming language to use the interface supplied by the libvirt library to use the virtualization capabilities of recent versions of Linux (and other OSes). -%endif %prep %setup -q @@ -56,21 +47,15 @@ find examples -type f -exec chmod 0644 \{\} \; %build CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build -%if %{with_python3} CFLAGS="$RPM_OPT_FLAGS" %{__python3} setup.py build -%endif %install %{__python} setup.py install --skip-build --root=%{buildroot} -%if %{with_python3} %{__python3} setup.py install --skip-build --root=%{buildroot} -%endif %check %{__python} setup.py test -%if %{with_python3} %{__python3} setup.py test -%endif %files %defattr(-,root,root) @@ -81,7 +66,6 @@ CFLAGS="$RPM_OPT_FLAGS" %{__python3} setup.py build %{_libdir}/python2*/site-packages/libvirtmod* %{_libdir}/python2*/site-packages/*egg-info -%if %{with_python3} %files -n libvirt-python3 %defattr(-,root,root) %doc ChangeLog AUTHORS NEWS README COPYING COPYING.LESSER examples/ @@ -95,6 +79,5 @@ CFLAGS="$RPM_OPT_FLAGS" %{__python3} setup.py build %{_libdir}/python3*/site-packages/__pycache__/libvirtaio.cpython-*.py* %{_libdir}/python3*/site-packages/libvirtmod* %{_libdir}/python3*/site-packages/*egg-info -%endif %changelog -- 2.13.3
On Wed, Aug 09, 2017 at 05:08:44PM +0100, Daniel P. Berrange wrote:
Signed-off-by: Daniel P. Berrange <berrange@redhat.com> --- libvirt-python.spec.in | 17 ----------------- 1 file changed, 17 deletions(-)
Reviewed-by: Martin Kletzander <mkletzan@redhat.com> I think this is reasonable even for CentOS 6
On Thu, Aug 10, 2017 at 09:27:27AM +0200, Martin Kletzander wrote:
On Wed, Aug 09, 2017 at 05:08:44PM +0100, Daniel P. Berrange wrote:
Signed-off-by: Daniel P. Berrange <berrange@redhat.com> --- libvirt-python.spec.in | 17 ----------------- 1 file changed, 17 deletions(-)
Reviewed-by: Martin Kletzander <mkletzan@redhat.com>
I think this is reasonable even for CentOS 6
Urgh, no, RHEL 7 has no Python3 by default, so we can't do this. I'm going to revert it, and merely change the 0%{?fedora} > 18 check to 0%{?fedora} 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 :|
On Thu, Aug 10, 2017 at 12:11:00PM +0100, Daniel P. Berrange wrote:
On Thu, Aug 10, 2017 at 09:27:27AM +0200, Martin Kletzander wrote:
On Wed, Aug 09, 2017 at 05:08:44PM +0100, Daniel P. Berrange wrote:
Signed-off-by: Daniel P. Berrange <berrange@redhat.com> --- libvirt-python.spec.in | 17 ----------------- 1 file changed, 17 deletions(-)
Reviewed-by: Martin Kletzander <mkletzan@redhat.com>
I think this is reasonable even for CentOS 6
Urgh, no, RHEL 7 has no Python3 by default, so we can't do this. I'm going to revert it, and merely change the 0%{?fedora} > 18 check to 0%{?fedora}
It doesn't have it as default, but if you want to build this package, it only requires packages that exist, so it's still possible to build this, right?
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@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list
On Thu, Aug 10, 2017 at 02:01:40PM +0200, Martin Kletzander wrote:
On Thu, Aug 10, 2017 at 12:11:00PM +0100, Daniel P. Berrange wrote:
On Thu, Aug 10, 2017 at 09:27:27AM +0200, Martin Kletzander wrote:
On Wed, Aug 09, 2017 at 05:08:44PM +0100, Daniel P. Berrange wrote:
Signed-off-by: Daniel P. Berrange <berrange@redhat.com> --- libvirt-python.spec.in | 17 ----------------- 1 file changed, 17 deletions(-)
Reviewed-by: Martin Kletzander <mkletzan@redhat.com>
I think this is reasonable even for CentOS 6
Urgh, no, RHEL 7 has no Python3 by default, so we can't do this. I'm going to revert it, and merely change the 0%{?fedora} > 18 check to 0%{?fedora}
It doesn't have it as default, but if you want to build this package, it only requires packages that exist, so it's still possible to build this, right?
Sure you can find a py3 RPM from an optional channel and install it, but that doesn't fly for main koji / brew builds where you can't just pull in extra channels to the build root. 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 :|
participants (2)
-
Daniel P. Berrange -
Martin Kletzander