diff --git a/keystonemiddleware-5.2.2.tar.gz b/keystonemiddleware-5.2.2.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..b76205f5e95e1721b97cd244bb2c7b5d35304dc5 Binary files /dev/null and b/keystonemiddleware-5.2.2.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..bf2f1e0922db64c4cbd312ddea9d3c3b2a508926 100644 --- a/python-keystonemiddleware.spec +++ b/python-keystonemiddleware.spec @@ -1,40 +1,86 @@ %{!?upstream_version: %global upstream_version %{version}%{?milestone}} +%global sname keystonemiddleware + %global with_doc 1 -Name: python-keystonemiddleware -Version: 9.1.0 -Release: 2 +%global with_python3 0 + +%global common_desc \ +This package contains middleware modules designed to provide authentication \ +and authorization features to web services other than OpenStack Keystone. \ +The most prominent module is keystonemiddleware.auth_token. \ +This package does not expose any CLI or Python API features. + +Name: python-%{sname} +Version: 5.2.2 +Release: 1 Summary: Middleware for OpenStack Identity + License: Apache-2.0 URL: http://launchpad.net/keystonemiddleware -Source0: https://tarballs.openstack.org/keystonemiddleware/keystonemiddleware-%{version}.tar.gz +Source0: https://tarballs.openstack.org/%{sname}/%{sname}-%{version}.tar.gz BuildArch: noarch BuildRequires: git BuildRequires: openstack-macros %description -Middleware for the OpenStack Identity API. +%{common_desc} -%package -n python3-keystonemiddleware +%package -n python2-%{sname} Summary: Middleware for OpenStack Identity -%{?python_provide:%python_provide python3-keystonemiddleware} +BuildRequires: python2-devel +BuildRequires: python2-setuptools +BuildRequires: python2-pbr +# Required to generate sample config automatically in documentation +BuildRequires: python2-oslo-config +BuildRequires: python2-oslo-log +BuildRequires: python2-keystoneauth1 +BuildRequires: python2-keystoneclient +BuildRequires: python2-oslo-cache + +Requires: python2-keystoneclient >= 1:3.8.0 +# for s3 and ec2 token middlewares +Requires: python2-keystoneauth1 >= 3.4.0 +Requires: python2-oslo-config >= 2:5.2.0 +Requires: python2-oslo-context >= 2.19.2 +Requires: python2-oslo-i18n >= 3.15.3 +Requires: python2-oslo-log >= 3.36.0 +Requires: python2-oslo-serialization >= 2.18.0 +Requires: python2-oslo-utils >= 3.33.0 +Requires: python2-pbr >= 2.0.0 +Requires: python2-pycadf >= 1.1.0 +Requires: python2-requests >= 2.14.2 +Requires: python2-six >= 1.10.0 +Requires: python2-oslo-cache >= 1.26.0 +Requires: python2-webob >= 1.7.1 + +%{?python_provide:%python_provide python2-%{sname}} + +%description -n python2-%{sname} +%{common_desc} + + +%if 0%{?with_python3} +%package -n python3-%{sname} +Summary: Middleware for OpenStack Identity 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-keystoneclient >= 1:3.8.0 +# for s3 and ec2 token middlewares +Requires: python3-webob >= 1.7.1 +Requires: python3-keystoneauth1 >= 3.4.0 +Requires: python3-oslo-config >= 2:5.2.0 +Requires: python3-oslo-context >= 2.19.2 Requires: python3-oslo-i18n >= 3.15.3 Requires: python3-oslo-log >= 3.36.0 Requires: python3-oslo-serialization >= 2.18.0 @@ -44,66 +90,92 @@ 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. +%{?python_provide:%python_provide python3-%{sname}} + +%description -n python3-%{sname} +%{common_desc} +%endif + %if 0%{?with_doc} -%package -n python-keystonemiddleware-doc +%package 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 +BuildRequires: python2-sphinx +BuildRequires: python2-openstackdocstheme +BuildRequires: python2-pycadf +BuildRequires: python2-oslotest +BuildRequires: python2-oslo-messaging +BuildRequires: python2-sphinxcontrib-apidoc +BuildRequires: python2-testresources +BuildRequires: python2-requests-mock +BuildRequires: python2-webtest + +%description doc Documentation for the Middleware for OpenStack Identity %endif %prep -%autosetup -n keystonemiddleware-%{upstream_version} -S git +%autosetup -n %{sname}-%{upstream_version} -S git +# Let RPM handle the dependencies %py_req_cleanup -rm -rf keystonemiddleware.egg-info +# Remove bundled egg-info +rm -rf %{sname}.egg-info +# disable warning-is-error, this project has intersphinx in docs +# so some warnings are generated in network isolated build environment +# as koji sed -i 's/^warning-is-error.*/warning-is-error = 0/g' setup.cfg %build -%{py3_build} +%py2_build +%if 0%{?with_python3} +%py3_build +%endif %if 0%{?with_doc} -sphinx-build-3 -b html doc/source doc/build/html +# generate html docs +sphinx-build -b html doc/source doc/build/html +# remove the sphinx-build leftovers rm -rf doc/build/html/.{doctrees,buildinfo} %endif %install -%{py3_install} -rm -r %{buildroot}%{python3_sitelib}/keystonemiddleware/tests +%if 0%{?with_python3} +%py3_install +# Delete tests +rm -r %{buildroot}%{python3_sitelib}/%{sname}/tests +%endif + +%py2_install +# Delete tests +rm -r %{buildroot}%{python2_sitelib}/%{sname}/tests -%files -n python3-keystonemiddleware +%files -n python2-%{sname} +%doc README.rst +%license LICENSE +%{python2_sitelib}/%{sname} +%{python2_sitelib}/%{sname}-*.egg-info + +%if 0%{?with_python3} +%files -n python3-%{sname} %doc README.rst %license LICENSE -%{python3_sitelib}/keystonemiddleware -%{python3_sitelib}/keystonemiddleware-*.egg-info +%{python3_sitelib}/%{sname} +%{python3_sitelib}/%{sname}-*.egg-info +%endif + %if 0%{?with_doc} -%files -n python-keystonemiddleware-doc +%files doc %doc doc/build/html LICENSE %endif %changelog -* Thu Jan 07 2021 Python_Bot +* Mon May 10 2021 Python_Bot - Package Spec generated - -