diff --git a/pbr-4.1.1.tar.gz b/pbr-4.1.1.tar.gz deleted file mode 100644 index 654c0a7..0000000 Binary files a/pbr-4.1.1.tar.gz and /dev/null differ diff --git a/pbr-5.4.5.tar.gz b/pbr-5.4.5.tar.gz new file mode 100644 index 0000000..1bfeb36 Binary files /dev/null and b/pbr-5.4.5.tar.gz differ diff --git a/python-pbr.spec b/python-pbr.spec index 07a8d14..10cc758 100644 --- a/python-pbr.spec +++ b/python-pbr.spec @@ -1,13 +1,12 @@ Name: python-pbr -Version: 4.1.1 -Release: 3 +Version: 5.4.5 +Release: 1 Summary: Python Build Reasonableness License: ASL 2.0 URL: http://pypi.python.org/pypi/pbr Source0: https://pypi.io/packages/source/p/pbr/pbr-%{version}.tar.gz BuildArch: noarch -BuildRequires: python3-sphinx >= 1.1.3 %description PBR is a library that injects some useful and sensible default behaviors into @@ -16,27 +15,14 @@ between all of the OpenStack projects. Around the time that OpenStack hit 18 different projects each with at least 3 active branches, it seems like a good time to make that code into a proper re-usable library. -%package -n python2-pbr -Summary: Python Build Reasonableness -%{?python_provide:%python_provide python2-pbr} - -BuildRequires: python2-devel python2-setuptools -BuildRequires: python2-coverage python2-mock -BuildRequires: python2-testscenarios git gnupg -Requires: python2-setuptools - - -%description -n python2-pbr -Manage dynamic plugins for Python applications - - %package -n python3-pbr Summary: Python Build Reasonableness %{?python_provide:%python_provide python3-pbr} BuildRequires: python3-devel python3-setuptools Requires: python3-setuptools - +Requires: git-core +Conflicts: python2-%{pypi_name} < 5.4.3-2 %description -n python3-pbr Manage dynamic plugins for Python applications @@ -48,34 +34,31 @@ rm -rf {test-,}requirements.txt pbr.egg-info/requires.txt %build export SKIP_PIP_INSTALL=1 -%py2_build %py3_build -sphinx-build doc/source html -rm -rf html/.{doctrees,buildinfo} - - %install %py3_install +rm -rf %{buildroot}%{python3_sitelib}/pbr/tests mv %{buildroot}%{_bindir}/pbr %{buildroot}%{_bindir}/pbr-3 - -%py2_install - -%files -n python2-pbr -%doc LICENSE html README.rst -%{_bindir}/pbr -%{python2_sitelib}/*.egg-info -%{python2_sitelib}/pbr -%exclude %{python2_sitelib}/pbr/tests +ln -s ./pbr-3 %{buildroot}%{_bindir}/pbr + +%if 0%{?do_test} +%check +%{__python3} setup.py test +%endif %files -n python3-pbr -%doc LICENSE html README.rst +%license LICENSE +%doc README.rst +%{_bindir}/pbr %{_bindir}/pbr-3 -%{python3_sitelib}/*.egg-info -%{python3_sitelib}/pbr -%exclude %{python3_sitelib}/pbr/tests +%{python3_sitelib}/*.egg-info/ +%{python3_sitelib}/pbr/ %changelog +* Wed Jul 29 2020 jinzhimin - 5.4.5-1 +- update to 5.4.5 + * Fri Feb 21 2020 Wanjiankang - 4.1.1-3 - Modify BuildRequires.