!5 [feature] Sync master branch with openEuler-20.03-LTS branch

Merge pull request !5 from zhanghailiang/master

libvirt-python.spec

@@ -1,50 +1,20 @@
 # -*- rpm-spec -*-
 
-# This spec file assumes you are building libvirt-python on openEuler version.
+Summary: The libvirt virtualization API python3 binding
-%define supported_platform 1
-# build both python2-libvirt and python3-libvirt
-%define _with_python2 1
-%define _with_python3 1
-
-# Whether py2 packages are assumed to have python2- name prefix
-%define py2_versioned_deps 1
-
-%{!?with_python2: %define with_python2 %{_with_python2}}
-%{!?with_python3: %define with_python3 %{_with_python3}}
-
-Summary: The libvirt virtualization API python2 binding
 Name: libvirt-python
-Version: 5.5.0
+Version: 6.2.0
 Release: 1
 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
 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
@@ -53,23 +23,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
@@ -80,60 +33,27 @@ 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 \{\} \;
 
 %build
-%if ! %{supported_platform}
-echo "This RPM requires either Fedora >= %{min_fedora} or RHEL >= %{min_rhel}"
-exit 1
-%endif
-
-%if %{with_python2}
-%py2_build
-%endif
-%if %{with_python3}
 %py3_build
-%endif
 
 %install
-%if %{with_python2}
-%py2_install
-%endif
-%if %{with_python3}
 %py3_install
-%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
-%defattr(-,root,root)
-%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
 %defattr(-,root,root)
 %doc ChangeLog AUTHORS NEWS README COPYING COPYING.LESSER examples/
@@ -147,8 +67,9 @@ exit 1
 %{python3_sitearch}/__pycache__/libvirtaio.cpython-*.py*
 %{python3_sitearch}/libvirtmod*
 %{python3_sitearch}/*egg-info
-%endif
 
 %changelog
+* Wed Apr 15 2020 Xu Yandong <xuyandong2@huawei.com> - 6.2.0-1
+- Rebase to version 6.2.0.
 * Fri Jul 19 2019 openEuler Buildteam <buildteam@openeuler.org> - 5.5.0-1
 - Update to 5.5.0 release, Initial package for openEuler.