From 3e86dc4d0e40c44861980ad70634d043b57bc353 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Nov 03 2020 12:03:11 +0000 Subject: import libvirt-python-6.0.0-1.module+el8.3.0+6423+e4cb6418 --- diff --git a/.gitignore b/.gitignore index a0ff6d0..ec5cd97 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/libvirt-python-4.5.0.tar.gz +SOURCES/libvirt-python-6.0.0.tar.gz diff --git a/.libvirt-python.metadata b/.libvirt-python.metadata index 31136ec..7d45412 100644 --- a/.libvirt-python.metadata +++ b/.libvirt-python.metadata @@ -1 +1 @@ -9183f6d27215bcac2be5584f42a55701647ce870 SOURCES/libvirt-python-4.5.0.tar.gz +174243ab59bddbbd72af141cdd4f5df3ba3a5be6 SOURCES/libvirt-python-6.0.0.tar.gz diff --git a/SPECS/libvirt-python.spec b/SPECS/libvirt-python.spec index 544e478..c859711 100644 --- a/SPECS/libvirt-python.spec +++ b/SPECS/libvirt-python.spec @@ -3,8 +3,8 @@ # This spec file assumes you are building on a Fedora or RHEL version # that's still supported by the vendor. It may work on other distros # or versions, but no effort will be made to ensure that going forward -%define min_rhel 6 -%define min_fedora 25 +%define min_rhel 7 +%define min_fedora 29 %if (0%{?fedora} && 0%{?fedora} >= %{min_fedora}) || (0%{?rhel} && 0%{?rhel} >= %{min_rhel}) %define supported_platform 1 @@ -12,59 +12,27 @@ %define supported_platform 0 %endif -%define _with_python2 1 -%if 0%{?fedora} > 29 || 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: 4.5.0 -Release: 2%{?dist}%{?extra_release} +Version: 6.0.0 +Release: 1%{?dist}%{?extra_release} Source0: http://libvirt.org/sources/python/%{name}-%{version}.tar.gz Url: http://libvirt.org License: LGPLv2+ -Group: Development/Libraries BuildRequires: git -BuildRequires: libvirt-devel >= 4.5.0-1%{?dist} -%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: libvirt-devel >= 6.0.0-1 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 %{python_sitearch}/.*\.so} -%endif -%if %{with_python3} %{?filter_provides_in: %filter_provides_in %{python3_sitearch}/.*\.so} -%endif %{?filter_setup} %description @@ -73,45 +41,30 @@ 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+ -Group: Development/Libraries -%{?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 License: LGPLv2+ -Group: Development/Libraries %{?python_provide:%python_provide python3-libvirt} Provides: libvirt-python3 = %{version}-%{release} 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 +%autosetup -S git_am -N + +git config gc.auto 0 + +%autopatch + # 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 \{\} \; @@ -121,43 +74,23 @@ echo "This RPM requires either Fedora >= %{min_fedora} or RHEL >= %{min_rhel}" exit 1 %endif -%if %{with_python2} -CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build -%endif -%if %{with_python3} +%if 0%{?fedora} || 0%{?rhel} >= 8 +%py3_build +%else CFLAGS="$RPM_OPT_FLAGS" %{__python3} setup.py build %endif %install -%if %{with_python2} -%{__python} setup.py install --skip-build --root=%{buildroot} -%endif -%if %{with_python3} +%if 0%{?fedora} || 0%{?rhel} >= 8 +%py3_install +%else %{__python3} setup.py install --skip-build --root=%{buildroot} %endif %check -%if %{with_python2} -%{__python} setup.py test -%endif -%if %{with_python3} %{__python3} setup.py test -%endif -%if %{with_python2} -%files -n python2-libvirt -%defattr(-,root,root) -%doc ChangeLog AUTHORS NEWS README COPYING COPYING.LESSER examples/ -%{python_sitearch}/libvirt.py* -%{python_sitearch}/libvirt_qemu.py* -%{python_sitearch}/libvirt_lxc.py* -%{python_sitearch}/libvirtmod* -%{python_sitearch}/*egg-info -%endif - -%if %{with_python3} %files -n python3-libvirt -%defattr(-,root,root) %doc ChangeLog AUTHORS NEWS README COPYING COPYING.LESSER examples/ %{python3_sitearch}/libvirt.py* %{python3_sitearch}/libvirtaio.py* @@ -169,9 +102,12 @@ CFLAGS="$RPM_OPT_FLAGS" %{__python3} setup.py build %{python3_sitearch}/__pycache__/libvirtaio.cpython-*.py* %{python3_sitearch}/libvirtmod* %{python3_sitearch}/*egg-info -%endif %changelog +* Mon Apr 27 2020 Danilo C. L. de Paula - 6.0.0 +- Resolves: bz#1810193 + (Upgrade components in virt:rhel module:stream for RHEL-8.3 release) + * Fri Jun 28 2019 Danilo de Paula - 4.5.0-2 - Rebuild all virt packages to fix RHEL's upgrade path - Resolves: rhbz#1695587