[python-django-horizon/el6-icehouse] Rebased to 2014.1.1

[Matthias Runge]

commit 200be615d65a463bac6185041e155c01a4033d36
Author: Matthias Runge <mrunge at redhat.com>
Date:   Tue Jun 17 09:05:06 2014 +0200

    Rebased to 2014.1.1

 0012-Re-enable-offline-compression.patch |   22 ++++++++++++++++++++++
 python-django-horizon.spec               |   17 ++++++++---------
 2 files changed, 30 insertions(+), 9 deletions(-)
---
diff --git a/0012-Re-enable-offline-compression.patch b/0012-Re-enable-offline-compression.patch
new file mode 100644
index 0000000..5a5ab6e
--- /dev/null
+++ b/0012-Re-enable-offline-compression.patch
@@ -0,0 +1,22 @@
+From 900aff6eba1547fb3ebc09aa756f0d50704ca885 Mon Sep 17 00:00:00 2001
+From: Matthias Runge <mrunge at redhat.com>
+Date: Tue, 17 Jun 2014 09:04:42 +0200
+Subject: [PATCH] Re-enable offline compression
+
+---
+ openstack_dashboard/settings.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/openstack_dashboard/settings.py b/openstack_dashboard/settings.py
+index 01e3308..7d5bcb9 100644
+--- a/openstack_dashboard/settings.py
++++ b/openstack_dashboard/settings.py
+@@ -146,7 +146,7 @@ COMPRESS_ENABLED = True
+ COMPRESS_OUTPUT_DIR = 'dashboard'
+ COMPRESS_CSS_HASHING_METHOD = 'hash'
+ COMPRESS_PARSER = 'compressor.parser.HtmlParser'
+-COMPRESS_OFFLINE = False
++COMPRESS_OFFLINE = True
+ 
+ INSTALLED_APPS = [
+     'openstack_dashboard',
diff --git a/python-django-horizon.spec b/python-django-horizon.spec
index 65e687f..a6360ab 100644
--- a/python-django-horizon.spec
+++ b/python-django-horizon.spec
@@ -34,6 +34,7 @@ Patch0008: 0008-Added-a-hook-for-redhat-openstack-access-plugin.patch
 Patch0009: 0009-fix-flake8-issues.patch
 Patch0010: 0010-remove-runtime-dep-to-python-pbr.patch
 Patch0011: 0011-Add-Change-password-link-to-the-RCUE-theme.patch
+Patch0012: 0012-Re-enable-offline-compression.patch
 
 
 BuildArch:  noarch
@@ -134,11 +135,7 @@ Summary:    Documentation for Django Horizon
 Group:      Documentation
 
 Requires:   %{name} = %{version}-%{release}
-%if 0%{?rhel}==6
-BuildRequires: python-sphinx10
-%else
 BuildRequires: python-sphinx >= 1.1.3
-%endif
 
 # Doc building basically means we have to mirror Requires:
 BuildRequires: python-dateutil
@@ -183,6 +180,9 @@ find . -name "django*.po" -exec rm -f '{}' \;
 # to distutils requires_dist config
 rm -rf {test-,}requirements.txt tools/{pip,test}-requires
 
+# make doc build compatible with python-oslo-sphinx RPM
+sed -i 's/oslosphinx/oslo.sphinx/' doc/source/conf.py
+
 # create images for custom theme
 mkdir -p openstack_dashboard_theme/static/dashboard/img
 cp %{SOURCE10} openstack_dashboard_theme/static/dashboard/img
@@ -209,11 +209,7 @@ sed -i 's:COMPRESS_OFFLINE = True:COMPRESS_OFFLINE = False:' openstack_dashboard
 
 # build docs
 export PYTHONPATH="$( pwd ):$PYTHONPATH"
-%if 0%{?rhel}==6
-sphinx-1.0-build -b html doc/source html
-%else
 sphinx-build -b html doc/source html
-%endif
 
 # undo hack
 cp openstack_dashboard/local/local_settings.py.example openstack_dashboard/local/local_settings.py
@@ -339,6 +335,7 @@ sed -i 's:^SECRET_KEY =.*:SECRET_KEY = "badcafe":' openstack_dashboard/local/loc
 %config(noreplace) %attr(0640, root, apache) %{_sysconfdir}/openstack-dashboard/local_settings
 %config(noreplace) %attr(0640, root, apache) %{_sysconfdir}/openstack-dashboard/keystone_policy.json
 %config(noreplace) %attr(0640, root, apache) %{_sysconfdir}/openstack-dashboard/cinder_policy.json
+%config(noreplace) %attr(0640, root, apache) %{_sysconfdir}/openstack-dashboard/glance_policy.json
 %config(noreplace) %attr(0640, root, apache) %{_sysconfdir}/openstack-dashboard/nova_policy.json
 
 %files doc
@@ -348,8 +345,10 @@ sed -i 's:^SECRET_KEY =.*:SECRET_KEY = "badcafe":' openstack_dashboard/local/loc
 %{_datadir}/openstack-dashboard/openstack_dashboard_theme
 
 %changelog
-* Tue Jun 10 2014 Matthias Runge <mrunge at redhat.com> - 2014.1.1-1
+* Tue Jun 17 2014 Matthias Runge <mrunge at redhat.com> - 2014.1.1-1
 - rebase to 2014.1.1
+- moved to git patch management
+- require python-sphinx >= 1.1.3
 
 * Tue Jan 28 2014 Matthias Runge <mrunge at redhat.com> - 2014.1-0.2b2
 - rebase to 2014.1.b2