diff --git a/.gitignore b/.gitignore index 70fd3d8..11fd928 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /pyVirtualize-57d2307f64f492b36fa99bc7c259210ec6a95635.tar.gz +/pyVirtualize-dc2d971cb1ff51b91f31b7390c0a6a3151003e1f.tar.gz diff --git a/python-pyvirtualize.spec b/python-pyvirtualize.spec index f8df033..1f59c33 100644 --- a/python-pyvirtualize.spec +++ b/python-pyvirtualize.spec @@ -1,15 +1,9 @@ %global srcname pyVirtualize %global modname pyvirtualize -%global date 20181003 -%global commit0 57d2307f64f492b36fa99bc7c259210ec6a95635 +%global date 20191018 +%global commit0 dc2d971cb1ff51b91f31b7390c0a6a3151003e1f -%if 0%{?rhel} >= 7 || 0%{?fedora} -%global with_python3 1 -%endif -%if 0%{?rhel} -%global with_python2 1 -%endif # FIXME epel7 Could not import extension sphinx.ext.githubpages (exception: No module named githubpages) %if 0%{?fedora} %global with_build_doc 1 @@ -30,8 +24,8 @@ And of course, you can use it to access all the API through python. Name: python-%{modname} # pypi tells current version is 0.9 -Version: 0.9 -Release: 9.%{date}git%(c=%commit0; echo ${c:0:7} )%{?dist} +Version: 0.10 +Release: 1.%{date}git%(c=%commit0; echo ${c:0:7} )%{?dist} Summary: Another python frontend to access and manage pyvmomi License: ASL 2.0 @@ -43,22 +37,6 @@ BuildArch: noarch %description %desc -%if 0%{?with_python2} -%package -n python2-%{modname} -Summary: %{summary} -BuildRequires: python2-devel -BuildRequires: python2-setuptools -BuildRequires: python2-sphinx -# FIXME use python2 prefix when update is available in repo -BuildRequires: python-sphinx_rtd_theme -%{?python_provide:%python_provide python2-%{srcname}} -Requires: python2-pyvmomi - -%description -n python2-%{modname} -%desc -%endif - -%if 0%{?with_python3} %package -n python%{python3_pkgversion}-%{modname} Summary: %{summary} BuildRequires: python%{python3_pkgversion}-devel @@ -70,7 +48,6 @@ Requires: python%{python3_pkgversion}-pyvmomi %description -n python%{python3_pkgversion}-%{modname} %desc -%endif %if 0%{?python3_other_pkgversion} %package -n python%{python3_other_pkgversion}-%{modname} @@ -99,8 +76,7 @@ This package installs %{summary}. %autosetup -n %{srcname}-%{commit0} %build -%{?with_python2: %py2_build} -%{?with_python3: %py3_build} +%py3_build %{?python3_other_pkgversion: %py3_other_build} %if 0%{?with_build_doc} # drop useless files @@ -115,25 +91,14 @@ ln -fs %{_jsdir}/jquery/3/jquery.js docs/build/html/_static %install %{?python3_other_pkgversion: %py3_other_install} -%{?with_python3: %py3_install} -%{?with_python2: %py2_install} +%py3_install -%if 0%{?with_python2} -%files -n python2-%{modname} -%license LICENSE -%doc README.md -%{python2_sitelib}/%{srcname}/ -%{python2_sitelib}/%{srcname}-%{version}-py?.?.egg-info/ -%endif - -%if 0%{?with_python3} %files -n python%{python3_pkgversion}-%{modname} %license LICENSE %doc README.md %{python3_sitelib}/%{srcname}/ %{python3_sitelib}/%{srcname}-%{version}-py?.?.egg-info/ -%endif %if 0%{?python3_other_pkgversion} %files -n python%{python3_other_pkgversion}-%{modname} @@ -149,6 +114,12 @@ ln -fs %{_jsdir}/jquery/3/jquery.js docs/build/html/_static %changelog +* Thu Apr 02 2020 Raphael Groner - 0.10-1.20191018gitdc2d971 +- use latest snapshot, rhbz#1770851 +- improve support for python3 and dependencies, see upstream commits +- drop support for python2 +- get rid of useless build contionals + * Thu Jan 30 2020 Fedora Release Engineering - 0.9-9.20181003git57d2307 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index acf9b56..e82bda4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pyVirtualize-57d2307f64f492b36fa99bc7c259210ec6a95635.tar.gz) = c96e7f533ae6f7648bdbd88051f626c65fad412069f5368c8648078c6e6897497ec14b0d87032ca9fc71142e96303a21043fce69c28aafe7eb223c5c509bc967 +SHA512 (pyVirtualize-dc2d971cb1ff51b91f31b7390c0a6a3151003e1f.tar.gz) = b09c3d3de8a15c76a3d938bb8f7814374aa16712ab86ac0588f69ad38280cb6a39dd88490949378d92b3b407ca6681bb0b979aef1d23328dfa9209ad5d513c0c