diff --git a/keystonemiddleware-4.21.0.tar.gz b/keystonemiddleware-4.21.0.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..41e10c20eee1f4154bb99b2644a30cf13f9f0a07 Binary files /dev/null and b/keystonemiddleware-4.21.0.tar.gz differ diff --git a/keystonemiddleware-9.1.0.tar.gz b/keystonemiddleware-9.1.0.tar.gz deleted file mode 100644 index c4d91512b23d92be42f68a6755f4eec7b831154c..0000000000000000000000000000000000000000 Binary files a/keystonemiddleware-9.1.0.tar.gz and /dev/null differ diff --git a/python-keystonemiddleware.spec b/python-keystonemiddleware.spec index ff4545990a20071977cd5a772e0c02bcfb2e51e1..0452890f25a6e6713a0f108a272b270909c0915a 100644 --- a/python-keystonemiddleware.spec +++ b/python-keystonemiddleware.spec @@ -1,109 +1,95 @@ -%{!?upstream_version: %global upstream_version %{version}%{?milestone}} -%global with_doc 1 - -Name: python-keystonemiddleware -Version: 9.1.0 -Release: 2 -Summary: Middleware for OpenStack Identity -License: Apache-2.0 -URL: http://launchpad.net/keystonemiddleware -Source0: https://tarballs.openstack.org/keystonemiddleware/keystonemiddleware-%{version}.tar.gz -BuildArch: noarch - -BuildRequires: git -BuildRequires: openstack-macros - +%global _empty_manifest_terminate_build 0 +Name: python-keystonemiddleware +Version: 4.21.0 +Release: 2 +Summary: Middleware for OpenStack Identity +License: Apache-2.0 +URL: https://docs.openstack.org/developer/keystonemiddleware/ +Source0: https://files.pythonhosted.org/packages/00/e5/b07bb783a5ec5a4976c1fdf88115f18fea9fa71fdf2f23c00a04ebc66a20/keystonemiddleware-4.21.0.tar.gz +BuildArch: noarch %description -Middleware for the OpenStack Identity API. - -%package -n python3-keystonemiddleware -Summary: Middleware for OpenStack Identity -%{?python_provide:%python_provide python3-keystonemiddleware} - - -BuildRequires: python3-devel -BuildRequires: python3-setuptools -BuildRequires: python3-pbr -BuildRequires: python3-pip -BuildRequires: python3-oslo-config -BuildRequires: python3-oslo-log -BuildRequires: python3-keystoneauth1 -BuildRequires: python3-keystoneclient -BuildRequires: python3-oslo-cache - -Requires: python3-keystoneclient >= 1:3.20.0 -Requires: python3-keystoneauth1 >= 3.12.0 -Requires: python3-oslo-config -Requires: python3-oslo-context -Requires: python3-oslo-i18n >= 3.15.3 -Requires: python3-oslo-log >= 3.36.0 -Requires: python3-oslo-serialization >= 2.18.0 -Requires: python3-oslo-utils >= 3.33.0 -Requires: python3-pbr >= 2.0.0 -Requires: python3-pycadf >= 1.1.0 -Requires: python3-requests >= 2.14.2 -Requires: python3-six >= 1.10.0 -Requires: python3-oslo-cache >= 1.26.0 -Requires: python3-webob >= 1.7.1 - -%description -n python3-keystonemiddleware -Middleware for the OpenStack Identity API. - -%if 0%{?with_doc} -%package -n python-keystonemiddleware-doc -Summary: Documentation for the Middleware for OpenStack Identity -Group: Documentation - -BuildRequires: python3-sphinx -BuildRequires: python3-openstackdocstheme -BuildRequires: python3-pycadf -BuildRequires: python3-oslotest -BuildRequires: python3-oslo-messaging -BuildRequires: python3-sphinxcontrib-apidoc -BuildRequires: python3-sphinxcontrib-svg2pdfconverter -BuildRequires: python3-requests-mock -BuildRequires: python3-testresources -BuildRequires: python3-webtest - -%description -n python-keystonemiddleware-doc -Documentation for the Middleware for OpenStack Identity -%endif - + Team and repository tags .. Change things from this point onMiddleware for the +OpenStack Identity API (Keystone) This package contains middleware modules +designed to provide authentication and authorization features to web services +other than Keystone <. + +%package -n python2-keystonemiddleware +Summary: Middleware for OpenStack Identity +Provides: python2-keystonemiddleware +BuildRequires: python2-devel +BuildRequires: python2-setuptools +Requires: python2-keystoneauth1 +Requires: python2-oslo-cache +Requires: python2-oslo-config +Requires: python2-oslo-context +Requires: python2-oslo-i18n +Requires: python2-oslo-log +Requires: python2-oslo-serialization +Requires: python2-oslo-utils +Requires: python2-pbr +Requires: python2-pycadf +Requires: python2-keystoneclient +Requires: python2-requests +Requires: python2-six +Requires: python2-webob +Requires: python2-oslo-messaging +%description -n python2-keystonemiddleware + Team and repository tags .. Change things from this point onMiddleware for the +OpenStack Identity API (Keystone) This package contains middleware modules +designed to provide authentication and authorization features to web services +other than Keystone <. + +%package help +Summary: Development documents and examples for keystonemiddleware +Provides: python2-keystonemiddleware-doc +%description help + Team and repository tags .. Change things from this point onMiddleware for the +OpenStack Identity API (Keystone) This package contains middleware modules +designed to provide authentication and authorization features to web services +other than Keystone <. %prep -%autosetup -n keystonemiddleware-%{upstream_version} -S git -%py_req_cleanup -rm -rf keystonemiddleware.egg-info - -sed -i 's/^warning-is-error.*/warning-is-error = 0/g' setup.cfg +%autosetup -n keystonemiddleware-4.21.0 %build -%{py3_build} - -%if 0%{?with_doc} -sphinx-build-3 -b html doc/source doc/build/html -rm -rf doc/build/html/.{doctrees,buildinfo} -%endif - +%py2_build %install -%{py3_install} -rm -r %{buildroot}%{python3_sitelib}/keystonemiddleware/tests - - -%files -n python3-keystonemiddleware -%doc README.rst -%license LICENSE -%{python3_sitelib}/keystonemiddleware -%{python3_sitelib}/keystonemiddleware-*.egg-info - -%if 0%{?with_doc} -%files -n python-keystonemiddleware-doc -%doc doc/build/html LICENSE -%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-keystonemiddleware -f filelist.lst +%dir %{python2_sitelib}/* + +%files help -f doclist.lst +%{_docdir}/* %changelog -* Thu Jan 07 2021 Python_Bot +* Thu Jun 03 2021 wangxiyuan +- Bump release to fix the OBS error +* Wed May 12 2021 OpenStack_SIG - Package Spec generated - -