Update RPM specs to v. 2014.1.1

Change-Id: If4708033ff89b028c6e0ac868d88b1567a696bfa

diff --git a/rpm/SOURCES/0001-Don-t-access-the-net-while-building-docs.patch b/rpm/SOURCES/0001-Don-t-access-the-net-while-building-docs.patch
old mode 100755 (executable)
new mode 100644 (file)
index eaf3c0f..168ec46
--- a/rpm/SOURCES/0001-Don-t-access-the-net-while-building-docs.patch
+++ b/rpm/SOURCES/0001-Don-t-access-the-net-while-building-docs.patch
@@ -1,4 +1,4 @@
-From 0b41644eb78bd8ab8ca97b35d32239f3b46f710d Mon Sep 17 00:00:00 2001
+From e2f1e3f041c4be41902b7bcf83c539563002bf95 Mon Sep 17 00:00:00 2001
 From: Matthias Runge <mrunge@redhat.com>
 Date: Fri, 5 Apr 2013 10:16:19 +0200
 Subject: [PATCH] Don't access the net while building docs (Note this hasn't

diff --git a/rpm/SOURCES/0002-disable-debug-move-web-root.patch b/rpm/SOURCES/0002-disable-debug-move-web-root.patch
old mode 100755 (executable)
new mode 100644 (file)
index 62dcd7e..66ca32a
--- a/rpm/SOURCES/0002-disable-debug-move-web-root.patch
+++ b/rpm/SOURCES/0002-disable-debug-move-web-root.patch
@@ -1,4 +1,4 @@
-From d5a0d055ffeea44429ec2eb19c1038d091b89683 Mon Sep 17 00:00:00 2001
+From 80970e01b002c06fe1152d602b72ef2bc24d377d Mon Sep 17 00:00:00 2001
 From: Matthias Runge <mrunge@redhat.com>
 Date: Fri, 5 Apr 2013 10:07:53 +0200
 Subject: [PATCH] disable debug, move web root
@@ -9,7 +9,7 @@ Subject: [PATCH] disable debug, move web root
  2 files changed, 7 insertions(+), 5 deletions(-)
 
 diff --git a/openstack_dashboard/local/local_settings.py.example b/openstack_dashboard/local/local_settings.py.example
-index 74f7bf8..169fd93 100644
+index 20b56c3..96d2cde 100644
 --- a/openstack_dashboard/local/local_settings.py.example
 +++ b/openstack_dashboard/local/local_settings.py.example
 @@ -4,7 +4,7 @@ from django.utils.translation import ugettext_lazy as _
@@ -22,7 +22,7 @@ index 74f7bf8..169fd93 100644
  
  # Required for Django 1.5.
 diff --git a/openstack_dashboard/settings.py b/openstack_dashboard/settings.py
-index 6392edf..a0091b2 100644
+index f253e0f..2fee751 100644
 --- a/openstack_dashboard/settings.py
 +++ b/openstack_dashboard/settings.py
 @@ -31,7 +31,7 @@ warnings.formatwarning = lambda message, category, *args, **kwargs: \

diff --git a/rpm/SOURCES/0003-change-lockfile-location-to-tmp-and-also-add-localho.patch b/rpm/SOURCES/0003-change-lockfile-location-to-tmp-and-also-add-localho.patch
old mode 100755 (executable)
new mode 100644 (file)
index e136ec0..114e698
--- a/rpm/SOURCES/0003-change-lockfile-location-to-tmp-and-also-add-localho.patch
+++ b/rpm/SOURCES/0003-change-lockfile-location-to-tmp-and-also-add-localho.patch
@@ -1,4 +1,4 @@
-From 7c40cd2d3c625c10ef8913b70baa642838b90697 Mon Sep 17 00:00:00 2001
+From cb690db5b3278652a3176fac06e0b9af20ed449d Mon Sep 17 00:00:00 2001
 From: Matthias Runge <mrunge@redhat.com>
 Date: Thu, 25 Jul 2013 11:32:38 +0200
 Subject: [PATCH] change lockfile location to '/tmp' and also add localhost to
@@ -9,7 +9,7 @@ Subject: [PATCH] change lockfile location to '/tmp' and also add localhost to
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/openstack_dashboard/local/local_settings.py.example b/openstack_dashboard/local/local_settings.py.example
-index 169fd93..61cf4b1 100644
+index 96d2cde..d0fd2a7 100644
 --- a/openstack_dashboard/local/local_settings.py.example
 +++ b/openstack_dashboard/local/local_settings.py.example
 @@ -12,7 +12,7 @@ TEMPLATE_DEBUG = DEBUG

diff --git a/rpm/SOURCES/0004-Add-a-customization-module-based-on-RHOS.patch b/rpm/SOURCES/0004-Add-a-customization-module-based-on-RHOS.patch
old mode 100755 (executable)
new mode 100644 (file)
index a6a85d0..cbb4e64
--- a/rpm/SOURCES/0004-Add-a-customization-module-based-on-RHOS.patch
+++ b/rpm/SOURCES/0004-Add-a-customization-module-based-on-RHOS.patch
@@ -1,4 +1,4 @@
-From ec495b6474ad6c5db173246f135f0727b3284a78 Mon Sep 17 00:00:00 2001
+From fa7c650c0ae0a8d896672186af7dce191c6e819b Mon Sep 17 00:00:00 2001
 From: Matthias Runge <mrunge@redhat.com>
 Date: Thu, 14 Feb 2013 12:55:54 +0100
 Subject: [PATCH] Add a customization module based on RHOS
@@ -28,7 +28,7 @@ Conflicts:
  create mode 100644 openstack_dashboard_theme/templates/splash.html
 
 diff --git a/openstack_dashboard/settings.py b/openstack_dashboard/settings.py
-index a0091b2..d8f0219 100644
+index 2fee751..92d1e7d 100644
 --- a/openstack_dashboard/settings.py
 +++ b/openstack_dashboard/settings.py
 @@ -119,14 +119,13 @@ TEMPLATE_CONTEXT_PROCESSORS = (

diff --git a/rpm/SOURCES/0005-move-RBAC-policy-files-and-checks-to-etc-openstack-d.patch b/rpm/SOURCES/0005-move-RBAC-policy-files-and-checks-to-etc-openstack-d.patch
old mode 100755 (executable)
new mode 100644 (file)
index b2b088b..34b6552
--- a/rpm/SOURCES/0005-move-RBAC-policy-files-and-checks-to-etc-openstack-d.patch
+++ b/rpm/SOURCES/0005-move-RBAC-policy-files-and-checks-to-etc-openstack-d.patch
@@ -1,17 +1,17 @@
-From d9cbadf18ace9875baab015066b89d60cf6d68c4 Mon Sep 17 00:00:00 2001
+From 3d3f45c47b11ccf70e42c996797faa61c990b310 Mon Sep 17 00:00:00 2001
 From: Matthias Runge <mrunge@redhat.com>
 Date: Mon, 9 Sep 2013 14:13:07 +0200
 Subject: [PATCH] move RBAC policy files and checks to /etc/openstack-dashboard
 
 ---
- openstack_dashboard/local/local_settings.py.example | 11 ++++++-----
- 1 file changed, 6 insertions(+), 5 deletions(-)
+ openstack_dashboard/local/local_settings.py.example | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/openstack_dashboard/local/local_settings.py.example b/openstack_dashboard/local/local_settings.py.example
-index 61cf4b1..8306143 100644
+index d0fd2a7..a7a3bad 100644
 --- a/openstack_dashboard/local/local_settings.py.example
 +++ b/openstack_dashboard/local/local_settings.py.example
-@@ -248,12 +248,13 @@ TIME_ZONE = "UTC"
+@@ -248,7 +248,8 @@ TIME_ZONE = "UTC"
  # target installation.
  
  # Path to directory containing policy.json files
@@ -19,14 +19,5 @@ index 61cf4b1..8306143 100644
 +# POLICY_FILES_PATH = os.path.join(ROOT_PATH, "conf")
 +POLICY_FILES_PATH = '/etc/openstack-dashboard'
  # Map of local copy of service policy files
--#POLICY_FILES = {
--#    'identity': 'keystone_policy.json',
--#    'compute': 'nova_policy.json'
--#}
-+POLICY_FILES = {
-+    'identity': 'keystone_policy.json',
-+    'compute': 'nova_policy.json'
-+}
- 
- # Trove user and database extension support. By default support for
- # creating users and databases on database instances is turned on.
+ #POLICY_FILES = {
+ #    'identity': 'keystone_policy.json',

diff --git a/rpm/SOURCES/0006-move-SECRET_KEY-secret_key_store-to-tmp.patch b/rpm/SOURCES/0006-move-SECRET_KEY-secret_key_store-to-tmp.patch
old mode 100755 (executable)
new mode 100644 (file)
index cdb8afe..91b9e0c
--- a/rpm/SOURCES/0006-move-SECRET_KEY-secret_key_store-to-tmp.patch
+++ b/rpm/SOURCES/0006-move-SECRET_KEY-secret_key_store-to-tmp.patch
@@ -1,4 +1,4 @@
-From 47eedca830adccb81905f7e9388e141b54d7bf7a Mon Sep 17 00:00:00 2001
+From 4b0b0f7ab4f9d616dd93a35e07eec05f9140a7ac Mon Sep 17 00:00:00 2001
 From: Matthias Runge <mrunge@redhat.com>
 Date: Mon, 9 Sep 2013 20:52:51 +0200
 Subject: [PATCH] move SECRET_KEY secret_key_store to /tmp
@@ -8,7 +8,7 @@ Subject: [PATCH] move SECRET_KEY secret_key_store to /tmp
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/openstack_dashboard/local/local_settings.py.example b/openstack_dashboard/local/local_settings.py.example
-index 8306143..51897c1 100644
+index a7a3bad..7eca94e 100644
 --- a/openstack_dashboard/local/local_settings.py.example
 +++ b/openstack_dashboard/local/local_settings.py.example
 @@ -78,7 +78,6 @@ HORIZON_CONFIG = {

diff --git a/rpm/SOURCES/0007-RCUE-navbar-and-login-screen.patch b/rpm/SOURCES/0007-RCUE-navbar-and-login-screen.patch
old mode 100755 (executable)
new mode 100644 (file)
index f4bb89f..fc6e760
--- a/rpm/SOURCES/0007-RCUE-navbar-and-login-screen.patch
+++ b/rpm/SOURCES/0007-RCUE-navbar-and-login-screen.patch
@@ -1,4 +1,4 @@
-From a98c1160985c92c48cd830ecdec082beebea750c Mon Sep 17 00:00:00 2001
+From 66fe61a1fda8f2cf4cc809220c325fbad0afa1d8 Mon Sep 17 00:00:00 2001
 From: Matthias Runge <mrunge@redhat.com>
 Date: Fri, 7 Mar 2014 09:48:30 +0100
 Subject: [PATCH] RCUE navbar and login screen
@@ -19087,7 +19087,7 @@ index 0000000..f37f848
 +ADD_INSTALLED_APPS = ['openstack_dashboard.dashboards.theme']
 +
 diff --git a/openstack_dashboard/settings.py b/openstack_dashboard/settings.py
-index d8f0219..58c525e 100644
+index 92d1e7d..01e3308 100644
 --- a/openstack_dashboard/settings.py
 +++ b/openstack_dashboard/settings.py
 @@ -125,13 +125,15 @@ TEMPLATE_LOADERS = (

diff --git a/rpm/SOURCES/0008-Added-a-hook-for-redhat-openstack-access-plugin.patch b/rpm/SOURCES/0008-Added-a-hook-for-redhat-openstack-access-plugin.patch
old mode 100755 (executable)
new mode 100644 (file)
index 894512b..5bd4ccd
--- a/rpm/SOURCES/0008-Added-a-hook-for-redhat-openstack-access-plugin.patch
+++ b/rpm/SOURCES/0008-Added-a-hook-for-redhat-openstack-access-plugin.patch
@@ -1,4 +1,4 @@
-From 25ec4a6a0350cc4729babfbb879be8f20b5c99f2 Mon Sep 17 00:00:00 2001
+From 3efae4eee13893548215cb6eddde23bc187b162e Mon Sep 17 00:00:00 2001
 From: Matthias Runge <mrunge@redhat.com>
 Date: Mon, 31 Mar 2014 09:22:28 +0200
 Subject: [PATCH] Added a hook for redhat openstack access plugin

diff --git a/rpm/SOURCES/0009-fix-flake8-issues.patch b/rpm/SOURCES/0009-fix-flake8-issues.patch
new file mode 100644 (file)
index 0000000..886aca8
--- /dev/null
+++ b/rpm/SOURCES/0009-fix-flake8-issues.patch
@@ -0,0 +1,31 @@
+From aa900f036f028f838408b64b3ecfc69b28575a28 Mon Sep 17 00:00:00 2001
+From: Matthias Runge <mrunge@redhat.com>
+Date: Thu, 10 Apr 2014 09:27:21 +0200
+Subject: [PATCH] fix flake8 issues
+
+---
+ openstack_dashboard/dashboards/theme/theme_index/panel.py | 1 +
+ openstack_dashboard/enabled/_99_customization.py          | 1 -
+ 2 files changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/openstack_dashboard/dashboards/theme/theme_index/panel.py b/openstack_dashboard/dashboards/theme/theme_index/panel.py
+index 9c42a79..7d85f3c 100644
+--- a/openstack_dashboard/dashboards/theme/theme_index/panel.py
++++ b/openstack_dashboard/dashboards/theme/theme_index/panel.py
+@@ -20,6 +20,7 @@ import horizon
+ 
+ from openstack_dashboard.dashboards.theme import dashboard
+ 
++
+ class ThemePanel(horizon.Panel):
+     name = _("Panel providing a theme")
+     slug = 'theme_index'
+diff --git a/openstack_dashboard/enabled/_99_customization.py b/openstack_dashboard/enabled/_99_customization.py
+index f37f848..272bcbe 100644
+--- a/openstack_dashboard/enabled/_99_customization.py
++++ b/openstack_dashboard/enabled/_99_customization.py
+@@ -6,4 +6,3 @@ DEFAULT = False
+ ADD_EXCEPTIONS = {}
+ # A list of applications to be added to INSTALLED_APPS.
+ ADD_INSTALLED_APPS = ['openstack_dashboard.dashboards.theme']
+-

diff --git a/rpm/SOURCES/0010-remove-runtime-dep-to-python-pbr.patch b/rpm/SOURCES/0010-remove-runtime-dep-to-python-pbr.patch
new file mode 100644 (file)
index 0000000..bdaf569
--- /dev/null
+++ b/rpm/SOURCES/0010-remove-runtime-dep-to-python-pbr.patch
@@ -0,0 +1,33 @@
+From 5ed74de4018515843d1c034bd57d08245a8e8a90 Mon Sep 17 00:00:00 2001
+From: Matthias Runge <mrunge@redhat.com>
+Date: Fri, 15 Nov 2013 09:42:08 +0100
+Subject: [PATCH] remove runtime dep to python-pbr
+
+Change-Id: I0b8f7fb6138feb2ba23f11065e53f1ded5091ed0
+Resolves: rhbz 1029775
+---
+ horizon/version.py | 13 +++++++++++--
+ 1 file changed, 11 insertions(+), 2 deletions(-)
+
+diff --git a/horizon/version.py b/horizon/version.py
+index 972f6ce..a129ea2 100644
+--- a/horizon/version.py
++++ b/horizon/version.py
+@@ -14,6 +14,15 @@
+ #    License for the specific language governing permissions and limitations
+ #    under the License.
+ 
+-import pbr.version
+ 
+-version_info = pbr.version.VersionInfo('horizon')
++class VersionInfo(object):
++    release = "REDHATRELEASE"
++    version = "REDHATVERSION"
++
++    def version_string(self):
++        return self.version
++
++    def release_string(self):
++        return self.release
++
++version_info = VersionInfo()

diff --git a/rpm/SOURCES/0011-Add-Change-password-link-to-the-RCUE-theme.patch b/rpm/SOURCES/0011-Add-Change-password-link-to-the-RCUE-theme.patch
new file mode 100644 (file)
index 0000000..9c22b31
--- /dev/null
+++ b/rpm/SOURCES/0011-Add-Change-password-link-to-the-RCUE-theme.patch
@@ -0,0 +1,26 @@
+From 32d45e4c22fbec1da08804ed44303d8bb517d958 Mon Sep 17 00:00:00 2001
+From: Julie Pichon <jpichon@redhat.com>
+Date: Tue, 20 May 2014 16:22:31 +0100
+Subject: [PATCH] Add "Change password" link to the RCUE theme.
+
+Resolves rhbz: 1099076
+
+Change-Id: I2f3df72c40464a4478177a566c5cf8f2660e52e2
+---
+ openstack_dashboard/dashboards/theme/templates/_header.html | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/openstack_dashboard/dashboards/theme/templates/_header.html b/openstack_dashboard/dashboards/theme/templates/_header.html
+index 8ce279e..479adfb 100644
+--- a/openstack_dashboard/dashboards/theme/templates/_header.html
++++ b/openstack_dashboard/dashboards/theme/templates/_header.html
+@@ -20,7 +20,8 @@
+   <li class="dropdown {% if request.horizon.dashboard.slug == "settings" %}active{% endif %}">
+     <a href="#" class="dropdown-toggle" data-toggle="dropdown"><span class="rcueicon rcueicon-user"></span> {% blocktrans with username=request.user.username %}{{ username }}{% endblocktrans %}<b class="caret"></b></a>
+     <ul class="dropdown-menu">
+-      <li{% if request.horizon.dashboard.slug == "settings" %} class="active"{% endif %}><a href="{% url 'horizon:settings:user:index' %}">{% trans "Settings" %}</a></li>
++      <li{% if request.horizon.dashboard.slug == "settings" and request.horizon.panel.slug == "user" %} class="active"{% endif %}><a href="{% url 'horizon:settings:user:index' %}">{% trans "Settings" %}</a></li>
++      <li{% if request.horizon.dashboard.slug == "settings" and request.horizon.panel.slug == "password" %} class="active"{% endif %}><a href="{% url 'horizon:settings:password:index' %}">{% trans "Change Password" %}</a></li>
+       <li class="divider"></li>
+       <li><a href="{% url 'logout' %}">{% trans "Sign Out" %}</a></li>
+     </ul>

diff --git a/rpm/SOURCES/0012-Re-enable-offline-compression.patch b/rpm/SOURCES/0012-Re-enable-offline-compression.patch
new file mode 100644 (file)
index 0000000..5a5ab6e
--- /dev/null
+++ b/rpm/SOURCES/0012-Re-enable-offline-compression.patch
@@ -0,0 +1,22 @@
+From 900aff6eba1547fb3ebc09aa756f0d50704ca885 Mon Sep 17 00:00:00 2001
+From: Matthias Runge <mrunge@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/rpm/SOURCES/openstack-dashboard-httpd-2.4.conf b/rpm/SOURCES/openstack-dashboard-httpd-2.4.conf
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/rpm/SOURCES/openstack-dashboard-httpd-logging.conf b/rpm/SOURCES/openstack-dashboard-httpd-logging.conf
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/rpm/SOURCES/openstack-dashboard.conf b/rpm/SOURCES/openstack-dashboard.conf
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/rpm/SPECS/python-django-horizon.spec b/rpm/SPECS/python-django-horizon.spec
old mode 100755 (executable)
new mode 100644 (file)
index 86d5e5d..d30430d
--- a/rpm/SPECS/python-django-horizon.spec
+++ b/rpm/SPECS/python-django-horizon.spec
@@ -1,22 +1,27 @@
 %global with_compression 1
+
 Name:       python-django-horizon
-Version:    2014.1
-Release:    0.12.rc1%{?dist}
+Version:    2014.1.1
+Release:    1%{?dist}
 Summary:    Django application for talking to Openstack
 
 Group:      Development/Libraries
 # Code in horizon/horizon/utils taken from django which is BSD
 License:    ASL 2.0 and BSD
 URL:        http://horizon.openstack.org/
-Source0:    https://launchpad.net/horizon/icehouse/icehouse-rc1/+download/horizon-%{version}.rc1.tar.gz
+Source0:    https://launchpad.net/horizon/icehouse/%{version}/+download/horizon-%{version}.tar.gz
 Source1:    openstack-dashboard.conf
 Source2:    openstack-dashboard-httpd-2.4.conf
 
 # demo config for separate logging
 Source4:    openstack-dashboard-httpd-logging.conf
 
+# custom icons
+#Source10:   rhfavicon.ico
+#Source11:   rh-logo.png
+
 #
-# patches_base=2014.1.rc1
+# patches_base=2014.1.1
 #
 Patch0001: 0001-Don-t-access-the-net-while-building-docs.patch
 Patch0002: 0002-disable-debug-move-web-root.patch
@@ -26,12 +31,12 @@ Patch0005: 0005-move-RBAC-policy-files-and-checks-to-etc-openstack-d.patch
 Patch0006: 0006-move-SECRET_KEY-secret_key_store-to-tmp.patch
 Patch0007: 0007-RCUE-navbar-and-login-screen.patch
 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 needs to be located below patches in the spec file. Don't ask!
-#
-
 BuildArch:  noarch
 
 # Migrate to Django 15 (python-django)
@@ -42,20 +47,18 @@ Requires:   python-dateutil
 Requires:   pytz
 Requires:   python-lockfile
 Requires:   python-pbr
-Requires:   python-six >= 1.5.2
 
 BuildRequires: python2-devel
 BuildRequires: python-setuptools
 BuildRequires: python-d2to1
-BuildRequires: python-pbr >= 0.7.0
+BuildRequires: python-pbr >= 0.5.21
 BuildRequires: python-lockfile
 BuildRequires: python-eventlet
 BuildRequires: git
-BuildRequires: python-six >= 1.4.1
 
 # for checks:
 %if 0%{?rhel} == 0
-BuildRequires:   python-django-nose >= 1.2
+BuildRequires:   python-django-nose
 BuildRequires:   python-coverage
 BuildRequires:   python-mox
 BuildRequires:   python-nose-exclude
@@ -64,6 +67,7 @@ BuildRequires:   python-nose
 BuildRequires:   python-netaddr
 BuildRequires:   python-kombu
 BuildRequires:   python-anyjson
+BuildRequires:   pytz
 BuildRequires:   python-iso8601
 
 
@@ -85,13 +89,13 @@ Group:      Applications/System
 Requires:   httpd
 Requires:   mod_wsgi
 Requires:   python-django-horizon >= %{version}
-Requires:   python-django-openstack-auth >= 1.1.4
+Requires:   python-django-openstack-auth >= 1.1.3
 Requires:   python-django-compressor >= 1.3
-Requires:   python-django-appconf
-%if %{?with_compression} > 0
-Requires:   python-lesscpy
+%if %{with_compression} > 0
+Requires: python-lesscpy
 %endif
 
+Requires:   python-django-appconf
 Requires:   python-glanceclient
 Requires:   python-keystoneclient >= 1:0.7.0
 Requires:   python-novaclient >= 1:2.15.0
@@ -105,14 +109,14 @@ Requires:   python-netaddr
 Requires:   python-oslo-config
 Requires:   python-eventlet
 
-BuildRequires: python-django-openstack-auth >= 1.1.4
+BuildRequires: python2-devel
+BuildRequires: python-django-openstack-auth >= 1.1.3
 BuildRequires: python-django-compressor >= 1.3
 BuildRequires: python-django-appconf
 BuildRequires: python-lesscpy
 BuildRequires: python-oslo-config
 
-BuildRequires: pytz
-
+BuildRequires:   pytz
 %description -n openstack-dashboard
 Openstack Dashboard is a web user interface for Openstack. The package
 provides a reference implementation using the Django Horizon project,
@@ -125,16 +129,12 @@ 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
 BuildRequires: python-glanceclient
-BuildRequires: python-keystoneclient
+BuildRequires: python-keystoneclient >= 1:0.7.0
 BuildRequires: python-novaclient >= 1:2.15.0
 BuildRequires: python-neutronclient
 BuildRequires: python-cinderclient
@@ -156,8 +156,9 @@ Customization module for OpenStack Dashboard to provide a branded logo.
 
 %prep
 %setup -q -n horizon-%{version}
-# Use git to manage patches.           
-# http://rwmj.wordpress.com/2011/08/09/nice-rpm-git-patch-management-trick/            
+
+# Use git to manage patches.
+# http://rwmj.wordpress.com/2011/08/09/nice-rpm-git-patch-management-trick/
 git init
 git config user.email "python-django-horizon-owner@fedoraproject.org"
 git config user.name "python-django-horizon"
@@ -165,6 +166,7 @@ git add .
 git commit -a -q -m "%{version} baseline"
 git am %{patches}
 
+
 # remove unnecessary .po files
 find . -name "django*.po" -exec rm -f '{}' \;
 
@@ -175,19 +177,14 @@ 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
+#cp %{SOURCE11} openstack_dashboard_theme/static/dashboard/img 
+
 # drop config snippet
 cp -p %{SOURCE4} .
 
-%if 0%{?with_compression} > 0
-# set COMPRESS_OFFLINE=True
-sed -i 's:COMPRESS_OFFLINE = False:COMPRESS_OFFLINE = True:' openstack_dashboard/settings.py
-%else
-# set COMPRESS_OFFLINE=False
-sed -i 's:COMPRESS_OFFLINE = True:COMPRESS_OFFLINE = False:' openstack_dashboard/settings.py
-%endif
-
-
-
 %build
 %{__python} setup.py build
 
@@ -195,23 +192,18 @@ sed -i 's:COMPRESS_OFFLINE = True:COMPRESS_OFFLINE = False:' openstack_dashboard
 cp openstack_dashboard/local/local_settings.py.example openstack_dashboard/local/local_settings.py
 # dirty hack to make SECRET_KEY work:
 sed -i 's:^SECRET_KEY =.*:SECRET_KEY = "badcafe":' openstack_dashboard/local/local_settings.py
-%{__python} manage.py collectstatic --noinput 
 
-# offline compression
-%if 0%{?with_compression} > 0
+%if %{with_compression} > 0
+%{__python} manage.py collectstatic --noinput 
 %{__python} manage.py compress 
 cp -a static/dashboard %{_buildir}
+%else
+sed -i 's:COMPRESS_OFFLINE = True:COMPRESS_OFFLINE = False:' openstack_dashboard/settings.py
 %endif
 
-cp -a static/dashboard %{_buildir}
-
 # 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
@@ -223,7 +215,7 @@ rm -fr html/.doctrees html/.buildinfo
 %{__python} setup.py install -O1 --skip-build --root %{buildroot}
 
 # drop httpd-conf snippet
-%if 0%{?rhel} <7 && 0%{?fedora} <18
+%if 0%{?rhel} || 0%{?fedora} <18
 install -m 0644 -D -p %{SOURCE1} %{buildroot}%{_sysconfdir}/httpd/conf.d/openstack-dashboard.conf
 %else
 # httpd-2.4 changed the syntax
@@ -233,7 +225,6 @@ install -d -m 755 %{buildroot}%{_datadir}/openstack-dashboard
 install -d -m 755 %{buildroot}%{_sharedstatedir}/openstack-dashboard
 install -d -m 755 %{buildroot}%{_sysconfdir}/openstack-dashboard
 
-
 # Copy everything to /usr/share
 mv %{buildroot}%{python_sitelib}/openstack_dashboard \
    %{buildroot}%{_datadir}/openstack-dashboard
@@ -241,9 +232,7 @@ cp manage.py %{buildroot}%{_datadir}/openstack-dashboard
 rm -rf %{buildroot}%{python_sitelib}/openstack_dashboard
 
 # move customization stuff to /usr/share
-#mv openstack_dashboard/dashboards/theme %{buildroot}%{_datadir}/openstack-dashboard/openstack_dashboard/dashboards/
-#mv openstack_dashboard/enabled/_99_customization.py %{buildroot}%{_datadir}/openstack-dashboard/openstack_dashboard/enabled
-
+#mv openstack_dashboard_theme %{buildroot}%{_datadir}/openstack-dashboard
 
 # Move config to /etc, symlink it back to /usr/share
 mv %{buildroot}%{_datadir}/openstack-dashboard/openstack_dashboard/local/local_settings.py.example %{buildroot}%{_sysconfdir}/openstack-dashboard/local_settings
@@ -288,11 +277,8 @@ mkdir -p %{buildroot}%{_var}/log/horizon
 
 
 %check
-# don't run tests on rhel
 %if 0%{?rhel} == 0
 sed -i 's:^SECRET_KEY =.*:SECRET_KEY = "badcafe":' openstack_dashboard/local/local_settings.py
-
-# until django-1.6 support for tests is enabled, disable tests
 ./run_tests.sh -N -P
 %endif
 
@@ -320,13 +306,8 @@ sed -i 's:^SECRET_KEY =.*:SECRET_KEY = "badcafe":' openstack_dashboard/local/loc
 %{_datadir}/openstack-dashboard/static
 %{_datadir}/openstack-dashboard/openstack_dashboard/*.py*
 %{_datadir}/openstack-dashboard/openstack_dashboard/api
-%{_datadir}/openstack-dashboard/openstack_dashboard/dashboards/admin
-%{_datadir}/openstack-dashboard/openstack_dashboard/dashboards/project
-%{_datadir}/openstack-dashboard/openstack_dashboard/dashboards/router
-%{_datadir}/openstack-dashboard/openstack_dashboard/dashboards/settings
-%{_datadir}/openstack-dashboard/openstack_dashboard/dashboards/__init__.py*
+%{_datadir}/openstack-dashboard/openstack_dashboard/dashboards
 %{_datadir}/openstack-dashboard/openstack_dashboard/enabled
-#%exclude %{_datadir}/openstack-dashboard/openstack_dashboard/enabled/_99_customization.py
 %{_datadir}/openstack-dashboard/openstack_dashboard/local
 %{_datadir}/openstack-dashboard/openstack_dashboard/openstack
 %{_datadir}/openstack-dashboard/openstack_dashboard/static
@@ -340,66 +321,33 @@ sed -i 's:^SECRET_KEY =.*:SECRET_KEY = "badcafe":' openstack_dashboard/local/loc
 %dir %{_datadir}/openstack-dashboard/openstack_dashboard/locale/??
 %dir %{_datadir}/openstack-dashboard/openstack_dashboard/locale/??_??
 %dir %{_datadir}/openstack-dashboard/openstack_dashboard/locale/??/LC_MESSAGES
-%dir %{_datadir}/openstack-dashboard/openstack_dashboard/locale/??_??/LC_MESSAGES
 
 %dir %attr(0750, root, apache) %{_sysconfdir}/openstack-dashboard
 %dir %attr(0750, apache, apache) %{_sharedstatedir}/openstack-dashboard
 %dir %attr(0750, apache, apache) %{_var}/log/horizon
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/openstack-dashboard.conf
 %config(noreplace) %attr(0640, root, apache) %{_sysconfdir}/openstack-dashboard/local_settings
-%config(noreplace) %attr(0640, root, apache) %{_sysconfdir}/openstack-dashboard/cinder_policy.json
 %config(noreplace) %attr(0640, root, apache) %{_sysconfdir}/openstack-dashboard/keystone_policy.json
-%config(noreplace) %attr(0640, root, apache) %{_sysconfdir}/openstack-dashboard/nova_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
 %doc html
 
 %files -n openstack-dashboard-theme
-
+#%{_datadir}/openstack-dashboard/openstack_dashboard_theme
 
 %changelog
-* Fri Apr 04 2014 Matthias Runge <mrunge@redhat.com> - 2014.1-0.12.rc1
-- rebase to horizon-2014.1.rc1
-- remove runtime requirement to mox (rhbz#1080326)
+* Tue Jun 10 2014 Matthias Runge <mrunge@redhat.com> - 2014.1.1-1
+- rebase to 2014.1.1
 
-* Wed Apr 02 2014 Matthias Runge <mrunge@redhat.com> - 2014.1-0.11.b3
-- No images/javascript in horizon dashboard (rhbz#1081612)
-- skip selenium tests during build
-
-* Tue Apr 01 2014 Matthias Runge <mrunge@redhat.com> - 2014.1-0.10.b3
-- Failed to create a tenant (rhbz#1082646)
-- add Red Hat Access to the upper right corner based on RCUE (rhbz#1069316)
-- lower keystoneclient requirement until rc-1 build
-
-* Fri Mar 28 2014 Matthias Runge <mrunge@redhat.com> - 2014.1-0.9.b3
-- re-enable tests
-- increase requirements versions
-
-* Thu Mar 27 2014 Matthias Runge <mrunge@redhat.com> - 2014.1-0.8.b3
-- disable tests until lp bug 1298332 is resolved
-
-* Thu Mar 27 2014 Matthias Runge <mrunge@redhat.com> - 2014.1-0.7.b3
-- cleanup and re-enable tests
-
-* Wed Mar 26 2014 Matthias Runge <mrunge@redhat.com> - 2014.1-0.6.b3
-- move theme to dashboards/theme
-
-* Tue Mar 25 2014 Pádraig Brady <pbrady@redhat.com> - 2014.1-0.5.b3
-- add dependency on python-mox
-
-* Thu Mar 13 2014 Matthias Runge <mrunge@redhat.com> - 2014.1-0.4.b3
-- remove hard selenium requirement for tests
-
-* Fri Mar 07 2014 Matthias Runge <mrunge@redhat.com> - 2014.1-0.3.b3
-- rebase to 2014.1.b3
-
-* Sun Feb 02 2014 Matthias Runge <mrunge@redhat.com> - 2014.1-0.2b2
+* Tue Jan 28 2014 Matthias Runge <mrunge@redhat.com> - 2014.1-0.2b2
 - rebase to 2014.1.b2
-- make compression conditional
 
-* Fri Dec 06 2013 Matthias Runge <mrunge@redhat.com> - 2014.1-0.1b1
+* Fri Dec 13 2013 Matthias Runge <mrunge@redhat.com> - 2014.1-0.1b1
 - rebase to 2014.1.b1
+- make compression conditional
 
 * Mon Dec 02 2013 Matthias Runge <mrunge@redhat.com> - 2013.2-4
 - fixes CVE-2013-6406 (rhbz#1035913)