* Version: 3.1.0-1.el7~mos0
* Sync with https://github.com/openstack/rpm-packaging/blob/master/openstack/django_openstack_auth/django_openstack_auth.spec.j2
* Fix (build-)depends
Change-Id: I6aa39658f804d9b48c2d3a703ea3323669df82c5
-%if 0%{?fedora}
-# python3-keystoneclient missing
-# python3-oslo-policy missing
%global pypi_name django_openstack_auth
Name: python-django-openstack-auth
%global pypi_name django_openstack_auth
Name: python-django-openstack-auth
Release: 1%{?dist}~mos0
Summary: Django authentication backend for OpenStack Keystone
Release: 1%{?dist}~mos0
Summary: Django authentication backend for OpenStack Keystone
-License: BSD
-URL: http://pypi.python.org/pypi/django_openstack_auth/
-Source0: http://pypi.python.org/packages/source/d/%{pypi_name}/%{pypi_name}-%{version}.tar.gz
+License: ASL 2.0
+Group: Development/Languages/Python
+URL: http://docs.openstack.org/developer/django_openstack_auth/
+Source0: https://tarballs.openstack.org/%{pypi_name}/%{pypi_name}-%{version}.tar.gz
+BuildRequires: openstack-macros
%package -n python2-django-openstack-auth
Summary: Django authentication backend for OpenStack Keystone
%package -n python2-django-openstack-auth
Summary: Django authentication backend for OpenStack Keystone
-%{?python_provide:%python_provide python2-django-openstack-auth}
-BuildRequires: python2-devel
-BuildRequires: python-setuptools
-BuildRequires: python-sphinx
-BuildRequires: python-keystoneclient >= 1.7.0
-BuildRequires: python-iso8601
+Provides: python-%{pypi_name} = %{version}
+Obsoletes: python-%{pypi_name} < %{version}
+
+BuildRequires: gettext
+BuildRequires: python-django >= 1.8
+BuildRequires: python-devel
+BuildRequires: python-keystoneauth1 >= 2.17.0
+BuildRequires: python-keystoneclient >= 3.8.0
+BuildRequires: python-mock >= 2.0
+BuildRequires: python-mox3 >= 0.7.0
+BuildRequires: python-oslo-policy >= 1.17.0
+BuildRequires: python-oslotest >= 1.10.0
BuildRequires: python-pbr >= 1.8
BuildRequires: python-pbr >= 1.8
-BuildRequires: python-netaddr
+BuildRequires: python-sphinx
BuildRequires: python-oslo-sphinx >= 2.3.0
BuildRequires: python-oslo-sphinx >= 2.3.0
-BuildRequires: gettext
-BuildRequires: python-oslo-config >= 3.10.0
-BuildRequires: python-oslo-policy >= 1.9.0
-BuildRequires: python-mox3
-BuildRequires: python-mock
-BuildRequires: python-testscenarios
-
+BuildRequires: python-setuptools >= 16.0
+BuildRequires: python-testscenarios >= 0.4
Requires: python-django >= 1.8
Requires: python-django >= 1.8
-BuildRequires: python-django >= 1.8
-
-Requires: python-keystoneauth1 >= 2.7.0
-Requires: python-keystoneclient >= 1:1.7.0
-Requires: python-six >= 1.9.0
-Requires: python-oslo-config >= 3.10.0
-Requires: python-oslo-policy >= 1.9.0
+Requires: python-keystoneauth1 >= 2.17.0
+Requires: python-keystoneclient >= 3.8.0
+Requires: python-oslo-config >= 3.14.0
+Requires: python-oslo-policy >= 1.17.0
Requires: python-pbr >= 1.8
Requires: python-pbr >= 1.8
+Requires: python-six >= 1.9.0
%description -n python2-django-openstack-auth
Django OpenStack Auth is a pluggable Django authentication backend that
%description -n python2-django-openstack-auth
Django OpenStack Auth is a pluggable Django authentication backend that
%package -n python3-django-openstack-auth
Summary: Django authentication backend for OpenStack Keystone
%package -n python3-django-openstack-auth
Summary: Django authentication backend for OpenStack Keystone
-%{?python_provide:%python_provide python3-django-openstack-auth}
BuildRequires: python3-devel
BuildRequires: python3-setuptools
BuildRequires: python3-devel
BuildRequires: python3-setuptools
-BuildRequires: python3-sphinx
-BuildRequires: python3-keystoneclient >= 1.7.0
+BuildRequires: python3-sphinx >= 1.2.1
+BuildRequires: python3-keystoneclient >= 3.8.0
BuildRequires: python3-iso8601
BuildRequires: python3-pbr >= 1.8
BuildRequires: python3-netaddr
BuildRequires: python3-iso8601
BuildRequires: python3-pbr >= 1.8
BuildRequires: python3-netaddr
-BuildRequires: python3-oslo-sphinx >= 2.3.0
-BuildRequires: gettext
-BuildRequires: python3-oslo-config >= 3.10.0
-BuildRequires: python3-oslo-policy >= 1.9.0
-BuildRequires: python3-mock
-BuildRequires: python3-mox3
-BuildRequires: python3-testscenarios
-
-Requires: python3-django >= 1.8
+BuildRequires: python3-oslo-sphinx >= 4.7.0
+BuildRequires: python3-oslo-config >= 3.14.0
+BuildRequires: python3-oslo-policy >= 1.17.0
+BuildRequires: python3-mock >= 2.0
+BuildRequires: python3-mox3 >= 0.7.0
+BuildRequires: python3-testscenarios >= 0.4
BuildRequires: python3-django >= 1.8
BuildRequires: python3-django >= 1.8
-Requires: python3-keystoneauth1 >= 2.7.0
-Requires: python3-keystoneclient >= 1:1.7.0
+Requires: python3-django >= 1.8
+Requires: python3-keystoneauth1 >= 2.17.0
+Requires: python3-keystoneclient >= 1:3.8.0
Requires: python3-six >= 1.9.0
Requires: python3-six >= 1.9.0
-Requires: python3-oslo-config >= 3.10.0
-Requires: python3-oslo-policy >= 1.9.0
+Requires: python3-oslo-config >= 3.14.0
+Requires: python3-oslo-policy >= 1.17.0
Requires: python3-pbr >= 1.8
%description -n python3-django-openstack-auth
Requires: python3-pbr >= 1.8
%description -n python3-django-openstack-auth
The current version is designed to work with the
Keystone V2 API.
The current version is designed to work with the
Keystone V2 API.
-%setup -q -n %{pypi_name}-%{version}
-
-
-# Remove the requirements file so that pbr hooks don't add it
-# to distutils requires_dist config
+%autosetup -n %{pypi_name}-%{version}
rm -f {test-,}requirements.txt
%build
rm -f {test-,}requirements.txt
%build
-# generate translations
-cd openstack_auth && django-admin compilemessages && cd ..
-
-# remove unnecessary .po files
-find . -name "django.po" -exec rm -f '{}' \;
-
-
-%{__python} setup.py build
%if 0%{?with_python3}
%{__python3} setup.py build
%endif
# generate html docs
%if 0%{?with_python3}
%{__python3} setup.py build
%endif
# generate html docs
-PYTHONPATH=.:$PYTHONPATH sphinx-build doc/source html
+%{__python2} setup.py build_sphinx
+# remove the Sphinx-build leftovers
+rm -r doc/build/html/.buildinfo
-%{__python} setup.py install --skip-build --root %{buildroot}
-
-cp -r openstack_auth/locale %{buildroot}/%{python_sitelib}/openstack_auth
-
-%find_lang django
# don't include tests in the RPM
rm -rf %{buildroot}/%{python_sitelib}/openstack_auth/tests
# don't include tests in the RPM
rm -rf %{buildroot}/%{python_sitelib}/openstack_auth/tests
+# compile mo files from po files
+(cd %{buildroot}%{python2_sitelib}/openstack_auth && %{_bindir}/django-admin compilemessages)
+
+# Remove po files
+find %{buildroot}%{python2_sitelib} -name "*.po" -delete -print
+
+%find_lang django --all-name
+
%if 0%{?with_python3}
%{__python3} setup.py install --skip-build --root %{buildroot}
%endif
%check
%if 0%{?with_python3}
%{__python3} setup.py install --skip-build --root %{buildroot}
%endif
%check
-export PYTHONPATH=$PYTHONPATH
-%{__python} openstack_auth/tests/run_tests.py
+PYTHONPATH=. %{__python2} openstack_auth/tests/run_tests.py
%files -n python2-django-openstack-auth -f django.lang
%license LICENSE
%files -n python2-django-openstack-auth -f django.lang
%license LICENSE
-%dir %{python_sitelib}/openstack_auth
-%dir %{python_sitelib}/openstack_auth/locale
-%dir %{python_sitelib}/openstack_auth/locale/??/
-%dir %{python_sitelib}/openstack_auth/locale/??_??/
-%dir %{python_sitelib}/openstack_auth/locale/??/LC_MESSAGES
-%dir %{python_sitelib}/openstack_auth/locale/??_??/LC_MESSAGES
-%{python_sitelib}/openstack_auth/*.py*
-%{python_sitelib}/openstack_auth/plugin
-%{python_sitelib}/openstack_auth/locale/openstack_auth.pot
-%{python_sitelib}/%{pypi_name}-%{version}-py?.?.egg-info
+%doc README.rst
+%dir %{python2_sitelib}/openstack_auth
+%{python2_sitelib}/openstack_auth/locale
+%{python2_sitelib}/openstack_auth/*.py*
+%{python2_sitelib}/openstack_auth/plugin
+%{python2_sitelib}/%{pypi_name}-*.egg-info
%if 0%{?with_python3}
%files -n python3-django-openstack-auth -f django.lang
%license LICENSE
%if 0%{?with_python3}
%files -n python3-django-openstack-auth -f django.lang
%license LICENSE
-%dir %{python3_sitelib}/openstack_auth
-%dir %{python3_sitelib}/openstack_auth/locale
-%dir %{python3_sitelib}/openstack_auth/locale/??/
-%dir %{python3_sitelib}/openstack_auth/locale/??_??/
-%dir %{python3_sitelib}/openstack_auth/locale/??/LC_MESSAGES
-%dir %{python3_sitelib}/openstack_auth/locale/??_??/LC_MESSAGES
+%doc README.rst
+%dir %{python2_sitelib}/openstack_auth
+%{python3_sitelib}/openstack_auth/locale
%{python3_sitelib}/openstack_auth/*.py*
%{python3_sitelib}/openstack_auth/plugin
%{python3_sitelib}/openstack_auth/*.py*
%{python3_sitelib}/openstack_auth/plugin
-%{python3_sitelib}/openstack_auth/locale/openstack_auth.pot
-%{python3_sitelib}/%{pypi_name}-%{version}-py?.?.egg-info
+%{python3_sitelib}/%{pypi_name}-*.egg-info
+* Thu Jan 19 2017 Andrii Kroshchenko <akroshchenko@mirantis.com> - 3.1.0-1.el7~mos0
+- Sync changes with https://github.com/openstack/rpm-packaging/blob/master/openstack/django_openstack_auth/django_openstack_auth.spec.j2
+- Fix (build-)depends
+
* Fri Jun 24 2016 Ivan Udovichenko <iudovichenko@mirantis.com> - 2.3.0-1.el7~mos0
- Fix (build-)dependencies.
* Fri Jun 24 2016 Ivan Udovichenko <iudovichenko@mirantis.com> - 2.3.0-1.el7~mos0
- Fix (build-)dependencies.