From 098ba18ce3b4f0c6ad60a4a12acc92a540bcc3bb Mon Sep 17 00:00:00 2001 From: Alfredo Moralejo Date: May 10 2019 23:28:40 +0000 Subject: Update to stein release --- diff --git a/.gitignore b/.gitignore index 396892a..1a7c5b2 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /os-service-types-1.1.0.tar.gz +/os-service-types-1.6.0.tar.gz diff --git a/python-os-service-types.spec b/python-os-service-types.spec index 25f2865..36cdc43 100644 --- a/python-os-service-types.spec +++ b/python-os-service-types.spec @@ -1,24 +1,27 @@ +%{!?upstream_version: %global upstream_version %{version}%{?milestone}} %global pypi_name os-service-types %global module_name os_service_types + %global common_desc \ -OsServiceTypes is a Python library for consuming OpenStack \ -sevice-types-authority data. \ +OsServiceTypes is a Python library for consuming OpenStack sevice-types-authority data \ The OpenStack Service Types Authority contains information about official \ OpenStack services and their historical service-type aliases. \ The data is in JSON and the latest data should always be used. This simple \ library exists to allow for easy consumption of the data, along with a built-in \ -version of the data to use in case network access is for some reason not \ -possible and local caching of the fetched data. +version of the data to use in case network access is for some reason not possible \ +and local caching of the fetched data. + +%global with_doc 1 Name: python-%{pypi_name} -Version: 1.1.0 -Release: 9%{?dist} +Version: 1.6.0 +Release: 2%{?dist} Summary: Python library for consuming OpenStack sevice-types-authority data License: ASL 2.0 URL: http://www.openstack.org/ -Source0: https://tarballs.openstack.org/%{pypi_name}/%{pypi_name}-%{version}.tar.gz +Source0: https://tarballs.openstack.org/%{pypi_name}/%{pypi_name}-%{upstream_version}.tar.gz BuildArch: noarch BuildRequires: git @@ -33,16 +36,19 @@ Summary: %{summary} BuildRequires: python3-devel BuildRequires: python3-pbr BuildRequires: python3-subunit -BuildRequires: python3-oslotest BuildRequires: python3-testscenarios BuildRequires: python3-requests-mock -BuildRequires: python3-keystoneauth1 BuildRequires: python3-setuptools +%if 0%{?repo_bootstrap} == 0 +BuildRequires: python3-keystoneauth1 +BuildRequires: python3-oslotest +%endif Requires: python3-pbr >= 2.0.0 %description -n python3-%{pypi_name} %{common_desc} +%if 0%{?with_doc} %package -n python-%{pypi_name}-doc Summary: %{pypi_name} documentation @@ -52,60 +58,53 @@ BuildRequires: python3-sphinx %description -n python-%{pypi_name}-doc %{common_desc} + Documentation for %{pypi_name} +%endif %prep -%autosetup -n %{pypi_name}-%{version} -S git +%autosetup -n %{pypi_name}-%{upstream_version} -S git +# Let RPM handle the dependencies +rm -rf {test-,}requirements.txt # Remove bundled egg-info rm -rf %{pypi_name}.egg-info %build %py3_build + +%if 0%{?with_doc} # generate html docs %{__python3} setup.py build_sphinx -b html -# remove the sphinx-build leftovers +# remove the sphinx-build-3 leftovers rm -rf doc/build/html/.{doctrees,buildinfo} +%endif %install %py3_install + %check -export PYTHON=%{__python3} +%if 0%{?repo_bootstrap} == 0 %{__python3} setup.py test +%endif + %files -n python3-%{pypi_name} %license LICENSE %doc README.rst doc/source/readme.rst %{python3_sitelib}/%{module_name} -%{python3_sitelib}/%{module_name}-%{version}-py?.?.egg-info +%{python3_sitelib}/%{module_name}-%{upstream_version}-py?.?.egg-info +%if 0%{?with_doc} %files -n python-%{pypi_name}-doc %license LICENSE %doc doc/build/html +%endif %changelog -* Mon Feb 04 2019 Yatin Karel - 1.1.0-9 -- Remove python2 sub package (#1671990) - -* Sat Feb 02 2019 Fedora Release Engineering - 1.1.0-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Sat Jul 14 2018 Fedora Release Engineering - 1.1.0-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Tue Jun 19 2018 Miro Hrončok - 1.1.0-6 -- Rebuilt for Python 3.7 - -* Fri Feb 09 2018 Iryna Shcherbina - 1.1.0-5 -- Update Python 2 dependency declarations to new packaging standards - (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) +* Fri Mar 08 2019 Alfredo Morlejo 1.6.0-2 +- Disable bootstrap mode. -* Fri Feb 09 2018 Fedora Release Engineering - 1.1.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild +* Fri Mar 08 2019 RDO 1.6.0-1 +- Update to 1.6.0 -* Wed Oct 11 2017 ykarel - 1.1.0-3 -- Fix rpmlint warnings and use python2-subunit -* Wed Oct 11 2017 ykarel - 1.1.0-2 -- Incorporate some nits in spec from rdo-review -* Tue Oct 10 2017 ykarel - 1.1.0-1 -- Initial package. diff --git a/sources b/sources index 3272209..05c596a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (os-service-types-1.1.0.tar.gz) = d6a5e9ce633a92c61c7ca2b44e7c0bb5fb7f28efc3bdb7e240bb8c1d06f02ce1c038e11a709508dcdc4bbb8e1245297b7dafae5b49535b69359af576bb147130 +SHA512 (os-service-types-1.6.0.tar.gz) = 5269f54568304e038510542c5c29aefedb00449807a424426a03d450db6822b3c7d850da50b6804a9ee435298c0e56da31a031cdd09fc758780655f92de28662