From ccb021c4682714c0fefea637c09040cef5b394ff Mon Sep 17 00:00:00 2001 From: Ivan Udovichenko Date: Fri, 3 Jun 2016 17:07:01 +0300 Subject: [PATCH] [MOS 9.0] Update horizon package Change-Id: I33deafc56d37833ae0d4ec1305750db38f9cacf3 Versions: 2:9.0.1-1~u14.04+mos0 | 1:9.0.1-1.el7 --- centos7/rpm/SPECS/python-django-horizon.spec | 162 +++++++++---------- trusty/debian/changelog | 6 + 2 files changed, 86 insertions(+), 82 deletions(-) diff --git a/centos7/rpm/SPECS/python-django-horizon.spec b/centos7/rpm/SPECS/python-django-horizon.spec index 42698d7..84fb475 100644 --- a/centos7/rpm/SPECS/python-django-horizon.spec +++ b/centos7/rpm/SPECS/python-django-horizon.spec @@ -4,8 +4,8 @@ Name: python-django-horizon # Liberty semver reset # https://review.openstack.org/#/q/I6a35fa0dda798fad93b804d00a46af80f08d475c,n,z Epoch: 1 -Version: 8.0.0.0rc1 -Release: 2%{?dist}~mos8.0.3 +Version: 9.0.1 +Release: 1%{?dist} Summary: Django application for talking to Openstack Group: Development/Libraries @@ -29,21 +29,20 @@ Source5: python-django-horizon-logrotate.conf BuildArch: noarch -BuildRequires: python-django -Requires: python-django >= 1.7 +BuildRequires: python-django >= 1.8 +Requires: python-django >= 1.8 Requires: pytz >= 2013.6 Requires: python-lockfile Requires: python-six >= 1.9.0 -Requires: python-pbr >= 1.6 +Requires: python-pbr >= 1.8 BuildRequires: python2-devel -BuildRequires: python-setuptools +BuildRequires: python-setuptools >= 16.0 BuildRequires: python-d2to1 -BuildRequires: python-pbr >= 0.7.0 +BuildRequires: python-pbr >= 1.8 BuildRequires: python-lockfile -BuildRequires: python-eventlet BuildRequires: git BuildRequires: python-six >= 1.9.0 BuildRequires: gettext @@ -51,16 +50,16 @@ BuildRequires: gettext # for checks: %if 0%{?rhel} == 0 BuildRequires: python-django-nose >= 1.2 -BuildRequires: python-coverage -BuildRequires: python-mox3 +BuildRequires: python-coverage >= 3.6 +BuildRequires: python-mox3 >= 0.7.0 BuildRequires: python-nose-exclude BuildRequires: python-nose -BuildRequires: python-selenium +BuildRequires: python-selenium >= 2.50.1 %endif -BuildRequires: python-netaddr -BuildRequires: python-kombu -BuildRequires: python-anyjson -BuildRequires: python-iso8601 +BuildRequires: python-netaddr >= 0.7.12 +BuildRequires: python-kombu >= 3.0.25 +BuildRequires: python-anyjson >= 0.3.3 +BuildRequires: python-iso8601 >= 0.1.9 # additional provides to be consistent with other django packages Provides: django-horizon = %{epoch}:%{version}-%{release} @@ -81,28 +80,27 @@ Requires: httpd Requires: mod_wsgi Requires: %{name} = %{epoch}:%{version}-%{release} Requires: python-django-openstack-auth >= 2.0.0 -Requires: python-django-compressor >= 1.5 -Requires: python-django-babel >= 0.3.4 +Requires: python-django-compressor >= 2.0 +Requires: python-django-babel >= 0.4.0 Requires: python-django-appconf Requires: python-lesscpy Requires: PyYAML >= 3.1.0 Requires: python-iso8601 >= 0.1.9 -Requires: python-kombu >= 3.0.7 +Requires: python-kombu >= 3.0.25 Requires: python-httplib2 >= 0.7.5 -Requires: python-glanceclient >= 0.18.0 +Requires: python-glanceclient >= 2.0.0 Requires: python-keystoneclient >= 1:1.6.0 -Requires: python-novaclient >= 1:2.28.1 +Requires: python-novaclient >= 1:2.29.0 Requires: python-neutronclient >= 2.6.0 Requires: python-cinderclient >= 1.3.1 Requires: python-swiftclient >= 2.2.0 -Requires: python-heatclient >= 0.3.0 -Requires: python-ceilometerclient >= 1.5.0 +Requires: python-heatclient >= 0.6.0 +Requires: python-ceilometerclient >= 2.2.1 Requires: python-troveclient >= 1.2.0 -Requires: python-saharaclient >= 0.10.0 +Requires: python-saharaclient >= 0.13.0 Requires: python-netaddr >= 0.7.12 -Requires: python-oslo-config >= 2:2.3.0 -Requires: python-eventlet >= 0.17.4 +Requires: python-oslo-config >= 2:3.7.0 Requires: python-django-pyscss >= 2.0.2 Requires: python-XStatic >= 1.0.0 Requires: python-XStatic-jQuery >= 1.7.2 @@ -113,8 +111,8 @@ Requires: python-XStatic-D3 >= 3.1.6.2 Requires: python-XStatic-Font-Awesome >= 4.3.0 Requires: python-XStatic-Hogan >= 2.0.0.2 Requires: python-XStatic-JQuery-Migrate >= 1.2.1.1 -Requires: python-XStatic-JQuery-TableSorter -Requires: python-XStatic-JQuery-quicksearch +Requires: python-XStatic-JQuery-TableSorter >= 2.14.5.1 +Requires: python-XStatic-JQuery-quicksearch >= 2.0.3.1 Requires: python-XStatic-JSEncrypt >= 2.0.0.2 Requires: python-XStatic-Jasmine >= 2.1.2.0 Requires: python-XStatic-QUnit >= 1.14.0.2 @@ -127,18 +125,17 @@ Requires: python-XStatic-termjs >= 0.0.4 Requires: python-XStatic-smart-table >= 1.4.5.3 Requires: python-XStatic-Angular-lrdragndrop >= 1.0.2.2 Requires: python-XStatic-Angular-Gettext >= 2.1.0.2 -Requires: python-XStatic-Magic-Search >= 0.2.5.1 Requires: python-XStatic-bootswatch >= 3.3.5.3 Requires: python-XStatic-roboto-fontface >= 0.4.3.2 -Requires: python-XStatic-mdi == 1.1.70.1 +Requires: python-XStatic-mdi >= 1.1.70.1 Requires: python-scss >= 1.3.4 Requires: fontawesome-fonts-web >= 4.1.0 -Requires: python-oslo-concurrency >= 2.3.0 -Requires: python-oslo-i18n >= 1.5.0 -Requires: python-oslo-serialization >= 1.4.0 -Requires: python-oslo-utils >= 2.0.0 +Requires: python-oslo-concurrency >= 3.5.0 +Requires: python-oslo-i18n >= 2.1.0 +Requires: python-oslo-serialization >= 1.10.0 +Requires: python-oslo-utils >= 3.5.0 Requires: python-oslo-policy >= 0.5.0 Requires: python-babel >= 1.3 Requires: python-pint >= 0.5 @@ -146,52 +143,50 @@ Requires: python-pint >= 0.5 Requires: openssl >= 0.14 Requires: logrotate -BuildRequires: python-django-openstack-auth >= 1.1.7 -BuildRequires: python-django-compressor >= 1.5 +BuildRequires: python-django-openstack-auth >= 2.0.0 +BuildRequires: python-django-compressor >= 2.0 BuildRequires: python-django-appconf BuildRequires: python-lesscpy -BuildRequires: python-oslo-config BuildRequires: python-django-pyscss >= 2.0.2 -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:1.3.7 BuildRequires: python-XStatic-Angular-Mock -BuildRequires: python-XStatic-Angular-Bootstrap -BuildRequires: python-XStatic-D3 -BuildRequires: python-XStatic-Font-Awesome -BuildRequires: python-XStatic-Hogan -BuildRequires: python-XStatic-JQuery-Migrate -BuildRequires: python-XStatic-JQuery-TableSorter -BuildRequires: python-XStatic-JQuery-quicksearch -BuildRequires: python-XStatic-JSEncrypt -BuildRequires: python-XStatic-Jasmine -BuildRequires: python-XStatic-QUnit -BuildRequires: python-XStatic-Rickshaw -BuildRequires: python-XStatic-Spin -BuildRequires: python-XStatic-jquery-ui -BuildRequires: python-XStatic-Bootstrap-Datepicker -BuildRequires: python-XStatic-Bootstrap-SCSS -BuildRequires: python-XStatic-termjs -BuildRequires: python-XStatic-smart-table -BuildRequires: python-XStatic-Angular-lrdragndrop -BuildRequires: python-XStatic-Magic-Search -BuildRequires: python-XStatic-Angular-Gettext -BuildRequires: python-XStatic-bootswatch -BuildRequires: python-XStatic-roboto-fontface -BuildRequires: python-XStatic-mdi +BuildRequires: python-XStatic-Angular-Bootstrap >= 0.11.0.2 +BuildRequires: python-XStatic-D3 >= 3.1.6.2 +BuildRequires: python-XStatic-Font-Awesome >= 4.3.0 +BuildRequires: python-XStatic-Hogan >= 2.0.0.2 +BuildRequires: python-XStatic-JQuery-Migrate >= 1.2.1.1 +BuildRequires: python-XStatic-JQuery-TableSorter >= 2.14.5.1 +BuildRequires: python-XStatic-JQuery-quicksearch >= 2.0.3.1 +BuildRequires: python-XStatic-JSEncrypt >= 2.0.0.2 +BuildRequires: python-XStatic-Jasmine >= 2.1.2.0 +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-XStatic-jquery-ui >= 1.10.1 +BuildRequires: python-XStatic-Bootstrap-Datepicker >= 1.3.1.0 +BuildRequires: python-XStatic-Bootstrap-SCSS >= 3 +BuildRequires: python-XStatic-termjs >= 0.0.4 +BuildRequires: python-XStatic-smart-table >= 1.4.5.3 +BuildRequires: python-XStatic-Angular-lrdragndrop >= 1.0.2.2 +BuildRequires: python-XStatic-Angular-Gettext >= 2.1.0.2 +BuildRequires: python-XStatic-bootswatch >= 3.3.5.3 +BuildRequires: python-XStatic-roboto-fontface >= 0.4.3.2 +BuildRequires: python-XStatic-mdi >= 1.1.70.1 # bootstrap-scss requires at least python-scss >= 1.2.1 BuildRequires: python-scss >= 1.3.4 BuildRequires: fontawesome-fonts-web >= 4.1.0 -BuildRequires: python-oslo-concurrency -BuildRequires: python-oslo-config -BuildRequires: python-oslo-i18n -BuildRequires: python-oslo-serialization -BuildRequires: python-oslo-utils -BuildRequires: python-oslo-policy -BuildRequires: python-babel -BuildRequires: python-pint - -BuildRequires: pytz +BuildRequires: python-oslo-concurrency >= 3.5.0 +BuildRequires: python-oslo-config >= 2:3.7.0 +BuildRequires: python-oslo-i18n >= 2.1.0 +BuildRequires: python-oslo-serialization >= 1.10.0 +BuildRequires: python-oslo-utils >= 3.5.0 +BuildRequires: python-oslo-policy >= 0.5.0 +BuildRequires: python-babel >= 1.3 +BuildRequires: python-pint >= 0.5 + +BuildRequires: pytz >= 2013.6 BuildRequires: systemd %description -n openstack-dashboard @@ -209,17 +204,17 @@ Requires: %{name} = %{epoch}:%{version}-%{release} BuildRequires: python-sphinx >= 1.1.3 # Doc building basically means we have to mirror Requires: -BuildRequires: python-glanceclient -BuildRequires: python-keystoneclient -BuildRequires: python-novaclient >= 2.15.0 -BuildRequires: python-neutronclient -BuildRequires: python-cinderclient -BuildRequires: python-swiftclient -BuildRequires: python-heatclient -BuildRequires: python-ceilometerclient -BuildRequires: python-troveclient >= 1.0.0 -BuildRequires: python-saharaclient -BuildRequires: python-oslo-sphinx +BuildRequires: python-glanceclient >= 2.0.0 +BuildRequires: python-keystoneclient >= 1:1.6.0 +BuildRequires: python-novaclient >= 1:2.29.0 +BuildRequires: python-neutronclient >= 2.6.0 +BuildRequires: python-cinderclient >= 1.3.1 +BuildRequires: python-swiftclient >= 2.2.0 +BuildRequires: python-heatclient >= 0.6.0 +BuildRequires: python-ceilometerclient >= 2.2.1 +BuildRequires: python-troveclient >= 1.2.0 +BuildRequires: python-saharaclient >= 0.13.0 +BuildRequires: python-oslo-sphinx >= 2.5.0 %description doc Documentation for the Django Horizon application for talking with Openstack @@ -437,6 +432,9 @@ systemctl daemon-reload >/dev/null 2>&1 || : #%{_datadir}/openstack-dashboard/openstack_dashboard/enabled/_99_customization.* %changelog +* Fri Jun 03 2016 Ivan Udovichenko - 1:9.0.1-1.el7 +- Fix (build-)requirements. + * Thu Oct 15 2015 Proskurin Kirill - 1:8.0.0.0rc1-1%{?dist}~mos8.0.3 - update django-compressor build requirements to 1.5 - add missing requirements: django-babel, PyYAML, python-iso8601, python-kombu, python-httplib2 diff --git a/trusty/debian/changelog b/trusty/debian/changelog index 37cdc25..a307a35 100644 --- a/trusty/debian/changelog +++ b/trusty/debian/changelog @@ -1,3 +1,9 @@ +horizon (2:9.0.1-1~u14.04+mos0) mos9.0; urgency=medium + + * Bump up version to 9.0.1 + + -- Ivan Udovichenko Fri, 03 Jun 2016 15:45:55 +0300 + horizon (2:9.0.0-4~u14.04+mos0) mos9.0; urgency=medium * Add horizon-vendor-theme to depends of openstack-dashboard -- 2.45.2