mrunge pushed to python-django-openstack-auth (f22). "Rebase to 1.1.9 and build locales"

notifications at fedoraproject.org notifications at fedoraproject.org
Tue Apr 14 19:04:08 UTC 2015


>From e2325c1a54d661cad55d739060885a46b9318685 Mon Sep 17 00:00:00 2001
From: Matthias Runge <mrunge at redhat.com>
Date: Tue, 14 Apr 2015 13:55:55 +0200
Subject: Rebase to 1.1.9 and build locales


diff --git a/.gitignore b/.gitignore
index 75c73ab..0b6a2ac 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@
 /django_openstack_auth-1.1.5.tar.gz
 /django_openstack_auth-1.1.6.tar.gz
 /django_openstack_auth-1.1.7.tar.gz
+/django_openstack_auth-1.1.9.tar.gz
diff --git a/python-django-openstack-auth.spec b/python-django-openstack-auth.spec
index 80e919d..ddda903 100644
--- a/python-django-openstack-auth.spec
+++ b/python-django-openstack-auth.spec
@@ -25,6 +25,7 @@ BuildRequires:  python-iso8601
 BuildRequires:  python-pbr
 BuildRequires:  python-netaddr
 BuildRequires:  python-oslo-sphinx
+BuildRequires:  gettext
 
 Requires:   python-django
 BuildRequires:   python-django
@@ -45,10 +46,7 @@ Keystone V2 API.
 %patch0001 -p1
 
 # Remove bundled egg-info
-# rm -rf %{pypi_name}.egg-info
-
-# remove unnecessary .po files
-find . -name "django.po" -exec rm -f '{}' \;
+rm -rf %{pypi_name}.egg-info
 
 sed -i s/RPMVERSION/%{version}/ openstack_auth/__init__.py
 
@@ -60,6 +58,13 @@ rm -f {test-,}requirements.txt
 sed -i 's/oslosphinx/oslo.sphinx/' doc/source/conf.py
 
 %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
 
 # generate html docs
@@ -68,6 +73,8 @@ PYTHONPATH=.:$PYTHONPATH sphinx-build doc/source html
 %install
 %{__python} setup.py install --skip-build --root %{buildroot}
 
+cp -r openstack_auth/locale %{buildroot}/%{python_sitelib}/openstack_auth
+
 %if 0%{?rhel}==6
 # Handling locale files
 # This is adapted from the %%find_lang macro, which cannot be directly
@@ -97,6 +104,7 @@ rm -rf %{buildroot}/%{python_sitelib}/openstack_auth/tests
 %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/openstack
 %{python_sitelib}/openstack_auth/locale/openstack_auth.pot
 %{python_sitelib}/%{pypi_name}-%{version}-py?.?.egg-info
 
diff --git a/sources b/sources
index ce840ab..f86afc8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6afb0748dab95003b75f0d6f4f4a1100  django_openstack_auth-1.1.7.tar.gz
+a201c7efbf552042f0bae64814454162  django_openstack_auth-1.1.9.tar.gz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/python-django-openstack-auth.git/commit/?h=f22&id=e2325c1a54d661cad55d739060885a46b9318685


More information about the scm-commits mailing list