From a2e3bb8ea73bbbffc51f0c1b81e13ae1b9590d90 Mon Sep 17 00:00:00 2001 From: "Daniel P. Berrange" Date: Thu, 10 Aug 2017 12:11:40 +0100 Subject: Revert "rpm: assume python3 is always available" This reverts commit b302b6d884ad4c6c917203a463f3377f3615b030. Only drop the Fedora 18 test - RHEL must still build without python 3 --- libvirt-python.spec.in | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'libvirt-python.spec.in') diff --git a/libvirt-python.spec.in b/libvirt-python.spec.in index e4fb17a..0709bef 100644 --- a/libvirt-python.spec.in +++ b/libvirt-python.spec.in @@ -1,4 +1,9 @@ +%define with_python3 0 +%if 0%{?fedora} +%define with_python3 1 +%endif + Summary: The libvirt virtualization API python2 binding Name: libvirt-python Version: @PY_VERSION@ @@ -11,9 +16,11 @@ 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} @@ -40,6 +47,7 @@ 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 python3-libvirt Summary: The libvirt virtualization API python3 binding Url: http://libvirt.org @@ -54,6 +62,7 @@ The libvirt-python3 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 @@ -65,15 +74,21 @@ 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 -n python2-libvirt %defattr(-,root,root) @@ -84,6 +99,7 @@ CFLAGS="$RPM_OPT_FLAGS" %{__python3} setup.py build %{_libdir}/python2*/site-packages/libvirtmod* %{_libdir}/python2*/site-packages/*egg-info +%if %{with_python3} %files -n python3-libvirt %defattr(-,root,root) %doc ChangeLog AUTHORS NEWS README COPYING COPYING.LESSER examples/ @@ -97,5 +113,6 @@ 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 -- cgit v1.2.1