Add python-django-pyscss and bootstrap-datepicker dependencies

Change-Id: I8001bf88536e1b55b5b96a7cda2e894edfa5be8b

diff --git a/debian/control b/debian/control
index 912d277faa9dd6cb6707b441f9fbc8562e034a7c..7e3e6527265c24e41c1cc1c1f7831ed131701b28 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -27,6 +27,7 @@ Depends:
  python-cloudfiles,
  python-compressor (>= 1.4),
  python-django (>= 1.4),
+ python-django-pyscss (>= 1.0.2),
  python-glanceclient (>= 0.13.1),
  python-heatclient (>= 0.2.9) ,
  python-keystoneclient (>= 0.10.0),
@@ -44,6 +45,7 @@ Depends:
  python-xstatic-angular-mock (>= 1.2.1.1),
  python-xstatic-angular (>= 1.2.1.1),
  python-xstatic-d3 (>= 3.1.6.2),
+ python-xstatic-bootstrap-datepicker (>= 1.3.1.0),
  python-xstatic-font-awesome (>= 4.1.0),
  python-xstatic-hogan (>= 2.0.0.2),
  python-xstatic-jasmine (>= 1.3.1.1),

diff --git a/rpm/SPECS/python-django-horizon.spec b/rpm/SPECS/python-django-horizon.spec
index d21ac7f6aac17f3953b57a6b77b933a613e078cb..a2436f1d0b0243ffc7075b0466e3c48610a817b2 100644 (file)
--- a/rpm/SPECS/python-django-horizon.spec
+++ b/rpm/SPECS/python-django-horizon.spec
@@ -117,6 +117,7 @@ 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-Bootstrap-Datepicker >= 1.3.1.0
 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
@@ -134,13 +135,14 @@ BuildRequires: python-django-compressor >= 1.4
 BuildRequires: python-django-appconf
 BuildRequires: python-lesscpy
 BuildRequires: python-oslo-config
-BuildRequires: python-django-pyscss
+BuildRequires: python-django-pyscss >= 1.0.2
 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-Bootstrap-Datepicker >= 1.3.1.0
 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
@@ -151,6 +153,8 @@ 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-oslo-sphinx
+BuildRequires: python-sphinx
 
 BuildRequires: python-six >= 1.7.0
 
@@ -216,9 +220,6 @@ sed -i s/REDHATRELEASE/%{release}/ horizon/version.py
 # 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
-
 # drop config snippet
 cp -p %{SOURCE4} .