diff --git a/libvirt-python.spec b/libvirt-python.spec index 4bd4f58..dce2a58 100644 --- a/libvirt-python.spec +++ b/libvirt-python.spec @@ -12,58 +12,26 @@ %define supported_platform 0 %endif -%define _with_python2 1 -%if 0%{?fedora} > 30 || 0%{?rhel} > 7 -%define _with_python2 0 -%endif - -%define _with_python3 0 -%if 0%{?fedora} || 0%{?rhel} > 7 -%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}} - -Summary: The libvirt virtualization API python2 binding +Summary: The libvirt virtualization API python3 binding Name: libvirt-python -Version: 5.9.0 +Version: 6.0.0 Release: 1%{?dist} Source0: http://libvirt.org/sources/python/%{name}-%{version}.tar.gz Url: http://libvirt.org License: LGPLv2+ BuildRequires: libvirt-devel == %{version} -%if %{with_python2} -%if %{py2_versioned_deps} -BuildRequires: python2-devel -BuildRequires: python2-nose -BuildRequires: python2-lxml -%else -BuildRequires: python-devel -BuildRequires: python-nose -BuildRequires: python-lxml -%endif -%endif -%if %{with_python3} BuildRequires: python3-devel +%if 0%{?rhel} == 7 +BuildRequires: python36-nose +BuildRequires: python36-lxml +%else BuildRequires: python3-nose BuildRequires: python3-lxml %endif BuildRequires: gcc # Don't want provides for python shared objects -%if %{with_python2} -%{?filter_provides_in: %filter_provides_in %{python2_sitearch}/.*\.so} -%endif -%if %{with_python3} %{?filter_provides_in: %filter_provides_in %{python3_sitearch}/.*\.so} -%endif %{?filter_setup} %description @@ -72,23 +40,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_python2} -%package -n python2-libvirt -Summary: The libvirt virtualization API python2 binding -Url: http://libvirt.org -License: LGPLv2+ -%{?python_provide:%python_provide python2-libvirt} -Provides: libvirt-python = %{version}-%{release} -Obsoletes: libvirt-python <= 3.6.0-1%{?dist} - -%description -n python2-libvirt -The python2-libvirt 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 - -%if %{with_python3} %package -n python3-libvirt Summary: The libvirt virtualization API python3 binding Url: http://libvirt.org @@ -99,16 +50,15 @@ Obsoletes: libvirt-python3 <= 3.6.0-1%{?dist} %description -n python3-libvirt The python3-libvirt package contains a module that permits applications -written in the Python programming language to use the interface +written in the Python 3.x 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 # Unset execute bit for example scripts; it can introduce spurious -# RPM dependencies, like /usr/bin/python which can pull in python2 +# RPM dependencies, like /usr/bin/python3 # for the -python3 package find examples -type f -exec chmod 0644 \{\} \; @@ -118,56 +68,22 @@ echo "This RPM requires either Fedora >= %{min_fedora} or RHEL >= %{min_rhel}" exit 1 %endif -%if %{with_python2} -%if 0%{?fedora} || 0%{?rhel} >= 8 -%py2_build -%else -CFLAGS="$RPM_OPT_FLAGS" %{__python2} setup.py build -%endif -%endif -%if %{with_python3} %if 0%{?fedora} || 0%{?rhel} >= 8 %py3_build %else CFLAGS="$RPM_OPT_FLAGS" %{__python3} setup.py build %endif -%endif %install -%if %{with_python2} -%if 0%{?fedora} || 0%{?rhel} >= 8 -%py2_install -%else -%{__python2} setup.py install --skip-build --root=%{buildroot} -%endif -%endif -%if %{with_python3} %if 0%{?fedora} || 0%{?rhel} >= 8 %py3_install %else %{__python3} setup.py install --skip-build --root=%{buildroot} %endif -%endif %check -%if %{with_python2} -%{__python2} setup.py test -%endif -%if %{with_python3} %{__python3} setup.py test -%endif -%if %{with_python2} -%files -n python2-libvirt -%doc ChangeLog AUTHORS NEWS README COPYING COPYING.LESSER examples/ -%{python2_sitearch}/libvirt.py* -%{python2_sitearch}/libvirt_qemu.py* -%{python2_sitearch}/libvirt_lxc.py* -%{python2_sitearch}/libvirtmod* -%{python2_sitearch}/*egg-info -%endif - -%if %{with_python3} %files -n python3-libvirt %doc ChangeLog AUTHORS NEWS README COPYING COPYING.LESSER examples/ %{python3_sitearch}/libvirt.py* @@ -180,10 +96,12 @@ CFLAGS="$RPM_OPT_FLAGS" %{__python3} setup.py build %{python3_sitearch}/__pycache__/libvirtaio.cpython-*.py* %{python3_sitearch}/libvirtmod* %{python3_sitearch}/*egg-info -%endif %changelog +* Wed Jan 15 2020 Cole Robinson - 6.0.0-1 +- Update to version 6.0.0 + * Tue Nov 12 2019 Cole Robinson - 5.9.0-1 - Update to version 5.9.0 diff --git a/sources b/sources index ab37fd2..3f9b118 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libvirt-python-5.9.0.tar.gz) = d5f8e3eeb800bde58271fa8a7eb265a0370e05e26e8abd9ebb0ca0e33505d3eeba167b3c104e0f1226d824908744e319dff3a6fc42d4e6fcbb82b5a2b844535a +SHA512 (libvirt-python-6.0.0.tar.gz) = 1d64bdb430d099c6e72259e49d99aa985b9ba745c543d3a12ad614c48e1334a3607e093d93612c34e8ec3990e880f3d66fd33199605f2ec9a419193bbb839d58