[python-django-horizon: 5/6] Merge branch 'master' of ssh://pkgs.fedoraproject.org/python-django-horizon

[Matthias Runge]

commit 7d573ea7de5cd8adc5b3686b716f857d2bd4d847
Merge: b8dc0e9 b9be813
Author: Matthias Runge <mrunge at redhat.com>
Date:   Mon Feb 3 21:54:26 2014 +0100

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/python-django-horizon
    
    Conflicts:
    	0007-Settings-cleanup-use-newer-customization.patch
    	0008-do-not-truncate-the-logo-related-rhbz-877138.patch
    	0009-fix-a-warning-and-a-hacking-error-in-settings.py.patch
    	python-django-horizon.spec

 0010-RCUE-navbar-and-login-screen.patch |19023 +++++++++++++++++++++++++++++++
 python-django-horizon.spec              |    5 +-
 2 files changed, 19027 insertions(+), 1 deletions(-)
---
diff --cc python-django-horizon.spec
index c5287d5,5c0706f..25e8b64
--- a/python-django-horizon.spec
+++ b/python-django-horizon.spec
@@@ -1,4 -1,4 +1,5 @@@
 -
++<<<<<<< HEAD
 +%global with_compression 1
  Name:       python-django-horizon
  Version:    2014.1
  Release:    0.2b2%{?dist}
@@@ -24,13 -28,11 +25,14 @@@ Patch0003: 0003-change-lockfile-locatio
  Patch0004: 0004-Add-a-customization-module-based-on-RHOS.patch
  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-fix-up-issues-with-customization.patch
 -Patch0008: 0008-do-not-truncate-the-logo-related-rhbz-877138.patch
 -Patch0009: 0009-fix-a-warning-and-a-hacking-error-in-settings.py.patch
 -Patch0010: 0010-RCUE-navbar-and-login-screen.patch
 +Patch0007: 0007-Settings-cleanup-use-newer-customization.patch
 +Patch0008: 0008-RCUE-navbar-and-login-screen.patch
 +
 +
 +#
 +# BuildArch needs to be located below patches in the spec file. Don't ask!
 +#
+ 
  BuildArch:  noarch
  
  # epel6 has a separate Django14 package
@@@ -54,9 -56,9 +56,10 @@@ BuildRequires: python-d2to
  BuildRequires: python-pbr >= 0.5.21
  BuildRequires: python-lockfile
  BuildRequires: python-eventlet
+ BuildRequires: git
  
  # for checks:
 +%if 0%{?rhel} == 0
  BuildRequires:   python-django-nose
  BuildRequires:   python-coverage
  BuildRequires:   python-mox
@@@ -333,8 -319,8 +335,9 @@@ sed -i 's:^SECRET_KEY =.*:SECRET_KEY = 
  %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/cinder_policy.json
  %config(noreplace) %attr(0640, root, apache) %{_sysconfdir}/openstack-dashboard/nova_policy.json
  
  %files doc