X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=centos7%2Frpm%2FSPECS%2Fopenstack-cinder.spec;fp=centos7%2Frpm%2FSPECS%2Fopenstack-cinder.spec;h=09aa43aa6fb1e6c4a537e15cdf82f4d18081f768;hb=08318bb0a280b050d3ceac98f77621e86b86f634;hp=0adbbc6cdf29c39c03ad20528330d18d0ee2a9bb;hpb=c9eca96b8d6896cd8c966b2b338f7fc71303824b;p=openstack-build%2Fcinder-build.git diff --git a/centos7/rpm/SPECS/openstack-cinder.spec b/centos7/rpm/SPECS/openstack-cinder.spec index 0adbbc6cd..09aa43aa6 100644 --- a/centos7/rpm/SPECS/openstack-cinder.spec +++ b/centos7/rpm/SPECS/openstack-cinder.spec @@ -2,8 +2,8 @@ Name: openstack-cinder Epoch: 1 -Version: 9.0.0~b1 -Release: 1%{?dist} +Version: 9.0.0~b2 +Release: 1%{?dist}~mos0 Summary: OpenStack Volume service Group: Applications/System @@ -26,7 +26,7 @@ BuildRequires: python-oslo-sphinx >= 2.5.0 BuildRequires: python-pbr >= 1.6 BuildRequires: python-sphinx >= 1.1.2 BuildRequires: python-setuptools -BuildRequires: python-stevedore >= 1.10.0 +BuildRequires: python-stevedore >= 1.16.0 # Required to build cinder.conf BuildRequires: python-glanceclient >= 1:2.0.0 BuildRequires: python-google-api-client >= 1.4.2 @@ -36,7 +36,7 @@ BuildRequires: python-keystonemiddleware >= 4.0.0 BuildRequires: python-lxml >= 2.3 BuildRequires: python-novaclient >= 1:2.29.0 BuildRequires: python-oslo-concurrency >= 3.8.0 -BuildRequires: python-oslo-config >= 2:3.10.0 +BuildRequires: python-oslo-config >= 2:3.14.0 BuildRequires: python-oslo-context >= 2.4.0 BuildRequires: python-oslo-db >= 4.1.0 BuildRequires: python-oslo-i18n >= 2.1.0 @@ -45,12 +45,12 @@ BuildRequires: python-oslo-messaging >= 5.2.0 BuildRequires: python-oslo-middleware >= 3.0.0 BuildRequires: python-oslo-policy >= 1.9.0 BuildRequires: python-oslo-reports >= 0.6.0 -BuildRequires: python-oslo-rootwrap >= 2.0.0 +BuildRequires: python-oslo-rootwrap >= 5.0.0 BuildRequires: python-oslo-serialization >= 1.10.0 BuildRequires: python-oslo-service >= 1.10.0 -BuildRequires: python-oslo-utils >= 3.11.0 -BuildRequires: python-oslo-versionedobjects >= 1.9.1 -BuildRequires: python-oslo-vmware >= 1.16.0 +BuildRequires: python-oslo-utils >= 3.16.0 +BuildRequires: python-oslo-versionedobjects >= 1.13.0 +BuildRequires: python-oslo-vmware >= 2.11.0 BuildRequires: python-paramiko >= 2.0.0 BuildRequires: python-paste BuildRequires: python-suds-jurko >= 0.6 @@ -102,7 +102,7 @@ Requires: python-eventlet >= 0.18.2 Requires: python-greenlet >= 0.3.2 Requires: python-iso8601 >= 0.1.11 Requires: python-lxml >= 2.3 -Requires: python-stevedore >= 1.10.0 +Requires: python-stevedore >= 1.16.0 Requires: python-suds-jurko >= 0.6 Requires: python-tooz >= 1.28.0 @@ -118,14 +118,14 @@ Requires: python-swiftclient >= 2.2.0 Requires: python-keystoneclient >= 1:1.7.0 Requires: python-novaclient >= 1:2.29.0 -Requires: python-oslo-config >= 2:3.10.0 +Requires: python-oslo-config >= 2:3.14.0 Requires: python-six >= 1.9.0 Requires: python-babel >= 2.3.4 Requires: python-google-api-client >= 1.4.2 -Requires: python-oslo-rootwrap >= 2.0.0 -Requires: python-oslo-utils >= 3.11.0 +Requires: python-oslo-rootwrap >= 5.0.0 +Requires: python-oslo-utils >= 3.16.0 Requires: python-oslo-serialization >= 1.10.0 Requires: python-oslo-db >= 4.1.0 Requires: python-oslo-context >= 2.4.0 @@ -136,7 +136,7 @@ Requires: python-oslo-messaging >= 5.2.0 Requires: python-oslo-policy >= 1.9.0 Requires: python-oslo-reports >= 0.6.0 Requires: python-oslo-service >= 1.10.0 -Requires: python-oslo-versionedobjects >= 1.9.1 +Requires: python-oslo-versionedobjects >= 1.13.0 Requires: iscsi-initiator-utils @@ -153,7 +153,7 @@ Requires: python-keystonemiddleware >= 4.0.0 Requires: python-oauth2client >= 1.5.0 Requires: python-oslo-i18n >= 2.1.0 Requires: python-oslo-log >= 1.14.0 -Requires: python-oslo-vmware >= 1.16.0 +Requires: python-oslo-vmware >= 2.11.0 Requires: python-paste Requires: python-pbr >= 1.6 Requires: python-requests >= 2.10.0 @@ -209,27 +209,6 @@ rm -rf {test-,}requirements.txt tools/{pip,test}-requires %build %{__python2} setup.py build -# docs generation requires everything to be installed first -export PYTHONPATH="$( pwd ):$PYTHONPATH" - -pushd doc - -%if 0%{?with_doc} -SPHINX_DEBUG=1 sphinx-build -b html source build/html -# Fix hidden-file-or-dir warnings -rm -fr build/html/.doctrees build/html/.buildinfo -%endif - -# Create dir link to avoid a sphinx-build exception -mkdir -p build/man/.doctrees/ -ln -s . build/man/.doctrees/man - -pushd source - -SPHINX_DEBUG=1 sphinx-build -b man -c . man ../build/man - -popd -popd # Generate configuration files oslo-config-generator --config-file=cinder/config/cinder-config-generator.conf --output-file etc/cinder/cinder.conf.sample @@ -237,8 +216,15 @@ oslo-config-generator --config-file=cinder/config/cinder-config-generator.conf - %install %{__python2} setup.py install -O1 --skip-build --root %{buildroot} +# docs generation requires everything to be installed first +export PYTHONPATH="$( pwd ):$PYTHONPATH" + +%if 0%{?with_doc} +%{__python2} setup.py build_sphinx mkdir -p %{buildroot}%{_mandir}/man1 install -p -D -m 644 doc/build/man/*.1 %{buildroot}%{_mandir}/man1/ +%endif + # Setup directories install -d -m 755 %{buildroot}%{_sharedstatedir}/cinder @@ -344,12 +330,17 @@ exit 0 %{python2_sitelib}/cinder %{python2_sitelib}/cinder-*.egg-info + %if 0%{?with_doc} %files doc -%doc doc/build/html +%doc LICENSE doc/build/html %endif %changelog +* Tue Aug 16 2016 Andrii Kroshchenko - 9.0.0~b2.el7~mos0 +- Update to 9.0.0~b2 +- Update dependencies + * Tue Jun 28 2016 Mikhail Ivanov - 9.0.0~b1 - Update to 9.0.0.0b1 - Update build and runtime dependencies