diff --git a/keystoneauth1-4.3.1.tar.gz b/keystoneauth1-4.3.1.tar.gz deleted file mode 100644 index 9f65401a76d34db377dde8e65f62853d7fc27192..0000000000000000000000000000000000000000 Binary files a/keystoneauth1-4.3.1.tar.gz and /dev/null differ diff --git a/keystoneauth1-4.5.0.tar.gz b/keystoneauth1-4.5.0.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..7dc4844a3f1dbcc3fbd4e9a0e863053d1412351d Binary files /dev/null and b/keystoneauth1-4.5.0.tar.gz differ diff --git a/python-keystoneauth1.spec b/python-keystoneauth1.spec index 98cfff6b20093fd16b22566c00184a443ce9a6a9..fcbd3afa17c130e9de1f2a26809b2a3e68b00246 100644 --- a/python-keystoneauth1.spec +++ b/python-keystoneauth1.spec @@ -1,124 +1,113 @@ %global _empty_manifest_terminate_build 0 - -%global with_doc 1 - -%{!?upstream_version: %global upstream_version %{version}%{?milestone}} - -Name: python-keystoneauth1 -Version: 4.3.1 -Release: 1 -Summary: Authentication Library for OpenStack Clients -License: ASL 2.0 -URL: https://pypi.io/pypi/keystoneauth1 -Source0: https://tarballs.openstack.org/keystoneauth/keystoneauth1-%{upstream_version}.tar.gz -# Required for tarball sources verification - -BuildArch: noarch - +Name: python-keystoneauth1 +Version: 4.5.0 +Release: 1 +Summary: Authentication Library for OpenStack Identity +License: Apache-2.0 +URL: https://docs.openstack.org/keystoneauth/latest/ +Source0: https://files.pythonhosted.org/packages/18/4d/e6f986e9c12c1c817abcc1080bf7db56faf5ac86a7607a11a3c9cf722fa3/keystoneauth1-4.5.0.tar.gz +BuildArch: noarch %description Keystoneauth provides a standard way to do authentication and service requests \ within the OpenStack ecosystem. It is designed for use in conjunction with \ the existing OpenStack clients and for simplifying the process of writing \ new clients. -%package -n python3-keystoneauth1 -Summary: Authentication Libarary for OpenStack Identity -%{?python_provide:%python_provide python3-keystoneauth1} -%{?python_provide:%python_provide python3-keystoneauth} - -BuildRequires: git -BuildRequires: python3-devel -BuildRequires: python3-setuptools -BuildRequires: python3-six -BuildRequires: python3-pbr >= 2.0.0 -BuildRequires: python3-pip -# test requires -BuildRequires: python3-betamax >= 0.7.0 -BuildRequires: python3-fixtures >= 1.3.1 -BuildRequires: python3-mock -BuildRequires: python3-oslotest -BuildRequires: python3-oslo-config -BuildRequires: python3-oslo-utils -BuildRequires: python3-stestr -BuildRequires: python3-oauthlib -BuildRequires: python3-requests -BuildRequires: python3-os-service-types -BuildRequires: python3-stevedore -BuildRequires: python3-iso8601 -BuildRequires: python3-requests-mock >= 1.1 - -BuildRequires: python3-PyYAML -BuildRequires: python3-lxml -BuildRequires: python3-requests-kerberos - -Requires: python3-iso8601 >= 0.1.11 -Requires: python3-os-service-types >= 1.2.0 -Requires: python3-pbr >= 2.0.0 -Requires: python3-requests >= 2.14.2 -Requires: python3-six => 1.10.0 -Requires: python3-stevedore >= 1.20.0 - +%package -n python3-keystoneauth1 +Summary: Authentication Library for OpenStack Identity +Provides: python-keystoneauth1 +# Base build requires +BuildRequires: python3-devel +BuildRequires: python3-setuptools +BuildRequires: python3-pbr +BuildRequires: python3-pip +BuildRequires: python3-wheel +# General requires +BuildRequires: python3-iso8601 +BuildRequires: python3-os-service-types +BuildRequires: python3-requests +BuildRequires: python3-six +BuildRequires: python3-stevedore +BuildRequires: python3-betamax +BuildRequires: python3-fixtures +BuildRequires: python3-mock +BuildRequires: python3-requests-kerberos +BuildRequires: python3-oauthlib +BuildRequires: python3-lxml +# General requires +Requires: python3-iso8601 +Requires: python3-os-service-types +Requires: python3-pbr +Requires: python3-requests +Requires: python3-six +Requires: python3-stevedore +Requires: python3-betamax +Requires: python3-fixtures +Requires: python3-mock +Requires: python3-requests-kerberos +Requires: python3-oauthlib +Requires: python3-lxml %description -n python3-keystoneauth1 Keystoneauth provides a standard way to do authentication and service requests \ within the OpenStack ecosystem. It is designed for use in conjunction with \ the existing OpenStack clients and for simplifying the process of writing \ new clients. -%package -n python-keystoneauth1-doc -Summary: Documentation for OpenStack Identity Authentication Library - -BuildRequires: python3-sphinx -BuildRequires: python3-sphinxcontrib-apidoc -BuildRequires: python3-openstackdocstheme - -%description -n python-keystoneauth1-doc -Documentation for OpenStack Identity Authentication Library +%package help +Summary: Authentication Library for OpenStack Identity +Provides: python3-keystoneauth1-doc +%description help +Keystoneauth provides a standard way to do authentication and service requests \ +within the OpenStack ecosystem. It is designed for use in conjunction with \ +the existing OpenStack clients and for simplifying the process of writing \ +new clients. %prep -# Required for tarball sources verification -%autosetup -n keystoneauth1-%{upstream_version} - -sed -i '/sphinx.ext.intersphinx.*$/d' doc/source/conf.py - -# Let RPM handle the dependencies -rm -rf {test-,}requirements.txt -# Remove bundled egg-info -rm -rf keystoneauth1.egg-info - -# remove syntax tests -rm keystoneauth1/tests/unit/test_hacking_checks.py +%autosetup -n keystoneauth1-%{version} %build -%{py3_build} +%py3_build %install -%{py3_install} - -%if 0%{?with_doc} -# generate html docs -export PYTHONPATH=. -# Disabling warning-is-error because of issue with python2 giving a warning: -# "The config value `apidoc_module_dir' has type `unicode', expected to ['str']." -sphinx-build-3 -b html -d doc/build/doctrees doc/source doc/build/html -rm -rf doc/build/html/.buildinfo -%endif - -%check -PYTHON=%{__python3} stestr-3 run - -%files -n python3-keystoneauth1 -%doc README.rst -%license LICENSE -%{python3_sitelib}/keystoneauth1 -%{python3_sitelib}/*.egg-info - -%if 0%{?with_doc} -%files -n python-keystoneauth1-doc -%license LICENSE -%doc doc/build/html -%endif +%py3_install + +install -d -m755 %{buildroot}/%{_pkgdocdir} +if [ -d doc ]; then cp -arf doc %{buildroot}/%{_pkgdocdir}; fi +if [ -d docs ]; then cp -arf docs %{buildroot}/%{_pkgdocdir}; fi +if [ -d example ]; then cp -arf example %{buildroot}/%{_pkgdocdir}; fi +if [ -d examples ]; then cp -arf examples %{buildroot}/%{_pkgdocdir}; fi +pushd %{buildroot} +if [ -d usr/lib ]; then + find usr/lib -type f -printf "/%h/%f\n" >> filelist.lst +fi +if [ -d usr/lib64 ]; then + find usr/lib64 -type f -printf "/%h/%f\n" >> filelist.lst +fi +if [ -d usr/bin ]; then + find usr/bin -type f -printf "/%h/%f\n" >> filelist.lst +fi +if [ -d usr/sbin ]; then + find usr/sbin -type f -printf "/%h/%f\n" >> filelist.lst +fi +touch doclist.lst +if [ -d usr/share/man ]; then + find usr/share/man -type f -printf "/%h/%f.gz\n" >> doclist.lst +fi +popd +mv %{buildroot}/filelist.lst . +mv %{buildroot}/doclist.lst . + + +%files -n python3-keystoneauth1 -f filelist.lst +%dir %{python3_sitelib}/* + +%files help -f doclist.lst +%{_docdir}/* %changelog +* Mon Jul 04 2022 OpenStack_SIG - 4.5.0-1 +- Upgrade package python3-keystoneauth1 to version 4.5.0 + * Fri Jul 30 2021 huangtianhua - Upgrade to 4.3.1 to support OpenStack-W * Wed Jan 20 2021 zhangy1317