diff --git a/keystoneauth1-3.4.0.tar.gz b/keystoneauth1-3.4.0.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..3fd68019b2168ee3f64fde701c46a8de019a1265 Binary files /dev/null and b/keystoneauth1-3.4.0.tar.gz differ diff --git a/keystoneauth1-4.2.1.tar.gz b/keystoneauth1-4.2.1.tar.gz deleted file mode 100644 index 5f597efc8b3fab5e69ca72c4c3a74bb6a6cdfe0e..0000000000000000000000000000000000000000 Binary files a/keystoneauth1-4.2.1.tar.gz and /dev/null differ diff --git a/python-keystoneauth1.spec b/python-keystoneauth1.spec index 29b0c5a6d8a9639c493f58fabc063806000de4fe..667df2ed345ca69d792ddff0c82643f7209185b7 100644 --- a/python-keystoneauth1.spec +++ b/python-keystoneauth1.spec @@ -1,127 +1,83 @@ %global _empty_manifest_terminate_build 0 - -%global with_doc 1 - -%{!?upstream_version: %global upstream_version %{version}%{?milestone}} - -Name: python-keystoneauth1 -Version: 4.2.1 -Release: 3 -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: 3.4.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/ab/3e/370e9efe1d8f7dcecc44f746944a1533c1cc6c11827cebf8480df8b26d0b/keystoneauth1-3.4.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 - -%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 + Team and repository tags .. Change things from this point on keystoneauth This +package contains tools for authenticating to an OpenStack-based cloud. + +%package -n python2-keystoneauth1 +Summary: Authentication Library for OpenStack Identity +Provides: python2-keystoneauth1 +BuildRequires: python2-devel +BuildRequires: python2-setuptools +Requires: python2-pbr +Requires: python2-iso8601 +Requires: python2-requests +Requires: python2-six +Requires: python2-stevedore +Requires: python2-betamax +Requires: python2-fixtures +Requires: python2-mock +Requires: python2-requests-kerberos +Requires: python2-oauthlib +Requires: python2-lxml +%description -n python2-keystoneauth1 + Team and repository tags .. Change things from this point on keystoneauth This +package contains tools for authenticating to an OpenStack-based cloud. + +%package help +Summary: Development documents and examples for keystoneauth1 +Provides: python2-keystoneauth1-doc +%description help + Team and repository tags .. Change things from this point on keystoneauth This +package contains tools for authenticating to an OpenStack-based cloud. %prep -# Required for tarball sources verification -%autosetup -n keystoneauth1-%{upstream_version} -S git - -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-3.4.0 %build -%{py3_build} +%py2_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 +%py2_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 python2-keystoneauth1 -f filelist.lst +%dir %{python2_sitelib}/* + +%files help -f doclist.lst +%{_docdir}/* %changelog -* Wed Jan 20 2021 zhangy1317 -- Add BuildRequires python3-pip -* Tue Jan 05 2021 Python_Bot +* Wed May 12 2021 OpenStack_SIG - Package Spec generated - -