Update horizon dependency to include xstatic

Change-Id: I83ea51965ad707795bf55d1f5f404f2ba5b17a02
Partial-bug: #1364884

diff --git a/.gitreview b/.gitreview
index e9b1f37f7b4dc31b735ad1f0e665fd8a75126f68..7f413bc55e17f8e4cde0cf9802c90f806b203899 100644 (file)
--- a/.gitreview
+++ b/.gitreview
@@ -1,5 +1,5 @@
 [gerrit]
 host=gerrit.mirantis.com
-project=openstack/horizon.git
-defaultremote=gerrit-mirantis
-defaultbranch=openstack-ci/build/grizzly
+port=29418
+project=openstack-ci/openstack/horizon-build
+defaultbranch=master

diff --git a/debian/control b/debian/control
index 67a0fe19d5841f553322213eefb3633be7a7dbbf..912d277faa9dd6cb6707b441f9fbc8562e034a7c 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -40,6 +40,22 @@ Depends:
  python-swiftclient (>= 2.2.0),
  python-troveclient (>= 1.0.4),
  python-tz,
+ python-xstatic-angular-cookies (>= 1.2.1.1),
+ python-xstatic-angular-mock (>= 1.2.1.1),
+ python-xstatic-angular (>= 1.2.1.1),
+ python-xstatic-d3 (>= 3.1.6.2),
+ python-xstatic-font-awesome (>= 4.1.0),
+ python-xstatic-hogan (>= 2.0.0.2),
+ python-xstatic-jasmine (>= 1.3.1.1),
+ python-xstatic-jquery-migrate (>= 1.2.1.1),
+ python-xstatic-jquery.quicksearch (>= 2.0.3.1),
+ python-xstatic-jquery.tablesorter (>= 2.0.5b.0),
+ python-xstatic-jquery (>= 1.7.2),
+ python-xstatic-jsencrypt (>= 2.0.0.2),
+ python-xstatic-qunit (>= 1.14.0.2),
+ python-xstatic-rickshaw (>= 1.5.0),
+ python-xstatic-spin (>= 1.2.5.2),
+ python-xstatic (>= 1.0.0),
  ${misc:Depends},
  ${python:Depends}
 Recommends: memcached

diff --git a/rpm/SPECS/python-django-horizon.spec b/rpm/SPECS/python-django-horizon.spec
index 29717547991df5f5679b747461e1dfbf0fdeb736..d21ac7f6aac17f3953b57a6b77b933a613e078cb 100644 (file)
--- a/rpm/SPECS/python-django-horizon.spec
+++ b/rpm/SPECS/python-django-horizon.spec
@@ -112,8 +112,22 @@ Requires:   python-netaddr
 Requires:   python-oslo-config
 Requires:   python-eventlet
 Requires:   python-django-pyscss
-Requires:   python-XStatic
-Requires:   python-XStatic-jQuery
+Requires:   python-XStatic >= 1.0.0
+Requires:   python-XStatic-Angular >= 1.2.1.1
+Requires:   python-XStatic-Angular-Cookies >= 1.2.1.1
+Requires:   python-XStatic-Angular-Mock >= 1.2.1.1
+Requires:   python-XStatic-D3 >= 3.1.6.2
+Requires:   python-XStatic-Font-Awesome >= 4.1.0
+Requires:   python-XStatic-Hogan >= 2.0.0.2
+Requires:   python-XStatic-JQuery-Migrate >= 1.2.1.1
+Requires:   python-XStatic-JQuery.TableSorter >= 2.0.5b.0
+Requires:   python-XStatic-JQuery.quicksearch >= 2.0.3.1
+Requires:   python-XStatic-JSEncrypt >= 2.0.0.2
+Requires:   python-XStatic-Jasmine >= 1.3.1.1
+Requires:   python-XStatic-QUnit >= 1.14.0.2
+Requires:   python-XStatic-Rickshaw >= 1.5.0
+Requires:   python-XStatic-Spin >= 1.2.5.2
+Requires:   python-XStatic-jQuery >= 1.7.2
 
 BuildRequires: python-django-openstack-auth >= 1.1.6
 BuildRequires: python-django-compressor >= 1.4
@@ -121,8 +135,23 @@ BuildRequires: python-django-appconf
 BuildRequires: python-lesscpy
 BuildRequires: python-oslo-config
 BuildRequires: python-django-pyscss
-BuildRequires: python-XStatic
-BuildRequires: python-XStatic-jQuery
+BuildRequires: python-XStatic >= 1.0.0
+BuildRequires: python-XStatic-jQuery >= 1.7.2
+BuildRequires: python-XStatic-Angular >= 1.2.1.1
+BuildRequires: python-XStatic-Angular-Cookies >= 1.2.1.1
+BuildRequires: python-XStatic-Angular-Mock >= 1.2.1.1
+BuildRequires: python-XStatic-D3 >= 3.1.6.2
+BuildRequires: python-XStatic-Font-Awesome >= 4.1.0
+BuildRequires: python-XStatic-Hogan >= 2.0.0.2
+BuildRequires: python-XStatic-JQuery-Migrate >= 1.2.1.1
+BuildRequires: python-XStatic-JQuery.TableSorter >= 2.0.5b.0
+BuildRequires: python-XStatic-JQuery.quicksearch >= 2.0.3.1
+BuildRequires: python-XStatic-JSEncrypt >= 2.0.0.2
+BuildRequires: python-XStatic-Jasmine >= 1.3.1.1
+BuildRequires: python-XStatic-QUnit >= 1.14.0.2
+BuildRequires: python-XStatic-Rickshaw >= 1.5.0
+BuildRequires: python-XStatic-Spin >= 1.2.5.2
+
 BuildRequires: python-six >= 1.7.0
 
 BuildRequires: pytz
@@ -350,6 +379,21 @@ mkdir -p %{buildroot}%{_var}/log/horizon
 %{_datadir}/openstack-dashboard/openstack_dashboard/usage
 %{_datadir}/openstack-dashboard/openstack_dashboard/utils
 %{_datadir}/openstack-dashboard/openstack_dashboard/wsgi
+%{_datadir}/openstack-dashboard/openstack_dashboard/dashboards/identity/*.py*
+%{_datadir}/openstack-dashboard/openstack_dashboard/dashboards/identity/domains/*.py*
+%{_datadir}/openstack-dashboard/openstack_dashboard/dashboards/identity/domains/templates/domains/*html
+%{_datadir}/openstack-dashboard/openstack_dashboard/dashboards/identity/groups/*.py*
+%{_datadir}/openstack-dashboard/openstack_dashboard/dashboards/identity/groups/templates/groups/*html
+%{_datadir}/openstack-dashboard/openstack_dashboard/dashboards/identity/projects/*.py*
+%{_datadir}/openstack-dashboard/openstack_dashboard/dashboards/identity/projects/templates/projects/*html
+%{_datadir}/openstack-dashboard/openstack_dashboard/dashboards/identity/roles/*.py*
+%{_datadir}/openstack-dashboard/openstack_dashboard/dashboards/identity/roles/templates/roles/*html
+%{_datadir}/openstack-dashboard/openstack_dashboard/dashboards/identity/users/*.py*
+%{_datadir}/openstack-dashboard/openstack_dashboard/dashboards/identity/users/templates/users/*html
+%{_datadir}/openstack-dashboard/openstack_dashboard/management/*.py*
+%{_datadir}/openstack-dashboard/openstack_dashboard/management/commands/*.py*
+%{_datadir}/openstack-dashboard/openstack_dashboard/management/commands/*template
+%{_datadir}/openstack-dashboard/openstack_dashboard/templatetags/*.py*
 %dir %{_datadir}/openstack-dashboard/openstack_dashboard
 %dir %{_datadir}/openstack-dashboard/openstack_dashboard/locale
 %dir %{_datadir}/openstack-dashboard/openstack_dashboard/locale/??