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=0adbbc6cdf29c39c03ad20528330d18d0ee2a9bb;hb=b12edfe717bd5aaf72a5e269214c4d090af6dd1f;hp=ae84e9eb5f6deb4cc9db58dd5823e8ea5f543d59;hpb=be18c52ac1b2a26510beadf7fa9423f85ef323c7;p=openstack-build%2Fcinder-build.git diff --git a/centos7/rpm/SPECS/openstack-cinder.spec b/centos7/rpm/SPECS/openstack-cinder.spec index ae84e9eb5..0adbbc6cd 100644 --- a/centos7/rpm/SPECS/openstack-cinder.spec +++ b/centos7/rpm/SPECS/openstack-cinder.spec @@ -2,7 +2,7 @@ Name: openstack-cinder Epoch: 1 -Version: 8.0.0.0b3 +Version: 9.0.0~b1 Release: 1%{?dist} Summary: OpenStack Volume service @@ -10,7 +10,6 @@ Group: Applications/System License: ASL 2.0 URL: http://www.openstack.org/software/openstack-storage/ Source0: cinder-%{version}.tar.gz - Source1: cinder-dist.conf Source2: cinder.logrotate Source3: cinder-tgt.conf @@ -27,41 +26,41 @@ 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.5.0 +BuildRequires: python-stevedore >= 1.10.0 # Required to build cinder.conf -BuildRequires: python-glanceclient >= 1:1.2.0 +BuildRequires: python-glanceclient >= 1:2.0.0 BuildRequires: python-google-api-client >= 1.4.2 BuildRequires: python-httplib2 >= 0.7.5 -BuildRequires: python-keystoneclient >= 1:1.6.0 +BuildRequires: python-keystoneclient >= 1:1.7.0 BuildRequires: python-keystonemiddleware >= 4.0.0 BuildRequires: python-lxml >= 2.3 BuildRequires: python-novaclient >= 1:2.29.0 -BuildRequires: python-oslo-concurrency >= 3.5.0 -BuildRequires: python-oslo-config >= 2:3.7.0 -BuildRequires: python-oslo-context >= 0.2.0 +BuildRequires: python-oslo-concurrency >= 3.8.0 +BuildRequires: python-oslo-config >= 2:3.10.0 +BuildRequires: python-oslo-context >= 2.4.0 BuildRequires: python-oslo-db >= 4.1.0 BuildRequires: python-oslo-i18n >= 2.1.0 BuildRequires: python-oslo-log >= 1.14.0 -BuildRequires: python-oslo-messaging >= 4.0.0 +BuildRequires: python-oslo-messaging >= 5.2.0 BuildRequires: python-oslo-middleware >= 3.0.0 -BuildRequires: python-oslo-policy >= 0.5.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-serialization >= 1.10.0 -BuildRequires: python-oslo-service >= 1.0.0 -BuildRequires: python-oslo-utils >= 3.5.0 -BuildRequires: python-oslo-versionedobjects >= 1.5.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-paramiko >= 1.16.0 +BuildRequires: python-paramiko >= 2.0.0 BuildRequires: python-paste BuildRequires: python-suds-jurko >= 0.6 BuildRequires: python-swiftclient >= 2.2.0 BuildRequires: python-taskflow >= 1.26.0 BuildRequires: python-tooz >= 1.28.0 BuildRequires: python-webob >= 1.2.3 -BuildRequires: python2-os-win >= 0.2.1 +BuildRequires: python2-os-win >= 0.2.3 BuildRequires: pywbem -BuildRequires: os-brick >= 1.0.0 +BuildRequires: python-os-brick >= 1.3.0 Requires: python-cinder = %{epoch}:%{version}-%{release} @@ -76,7 +75,7 @@ Requires(postun): systemd Requires(pre): shadow-utils Requires: lvm2 -Requires: python-osprofiler >= 1.1.0 +Requires: python-osprofiler >= 1.3.0 Requires: python-rtslib >= 2.1.fb41 %description @@ -92,8 +91,8 @@ Requires: sudo Requires: qemu-img Requires: sysfsutils -Requires: os-brick >= 1.0.0 -Requires: python-paramiko >= 1.16.0 +Requires: python-os-brick >= 1.3.0 +Requires: python-paramiko >= 2.0.0 Requires: python-qpid Requires: python-kombu >= 3.0.7 @@ -101,13 +100,13 @@ Requires: python-amqplib Requires: python-eventlet >= 0.18.2 Requires: python-greenlet >= 0.3.2 -Requires: python-iso8601 >= 0.1.9 +Requires: python-iso8601 >= 0.1.11 Requires: python-lxml >= 2.3 -Requires: python-stevedore >= 1.5.0 +Requires: python-stevedore >= 1.10.0 Requires: python-suds-jurko >= 0.6 Requires: python-tooz >= 1.28.0 -Requires: python-sqlalchemy >= 0.9.9 +Requires: python-sqlalchemy >= 1.0.10 Requires: python-migrate >= 0.9.6 Requires: python-paste-deploy >= 1.5.0 @@ -116,36 +115,36 @@ Requires: python-webob >= 1.2.3 Requires: python-glanceclient >= 1:2.0.0 Requires: python-swiftclient >= 2.2.0 -Requires: python-keystoneclient >= 1:1.6.0 +Requires: python-keystoneclient >= 1:1.7.0 Requires: python-novaclient >= 1:2.29.0 -Requires: python-oslo-config >= 2:3.7.0 +Requires: python-oslo-config >= 2:3.10.0 Requires: python-six >= 1.9.0 -Requires: python-babel >= 1.3 +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.5.0 +Requires: python-oslo-utils >= 3.11.0 Requires: python-oslo-serialization >= 1.10.0 Requires: python-oslo-db >= 4.1.0 -Requires: python-oslo-context >= 0.2.0 -Requires: python-oslo-concurrency >= 3.5.0 +Requires: python-oslo-context >= 2.4.0 +Requires: python-oslo-concurrency >= 3.8.0 Requires: python-oslo-middleware >= 3.0.0 Requires: python-taskflow >= 1.26.0 -Requires: python-oslo-messaging >= 4.0.0 -Requires: python-oslo-policy >= 0.5.0 +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.0.0 -Requires: python-oslo-versionedobjects >= 1.5.0 +Requires: python-oslo-service >= 1.10.0 +Requires: python-oslo-versionedobjects >= 1.9.1 Requires: iscsi-initiator-utils -Requires: python-osprofiler >= 1.1.0 - +Requires: python-osprofiler >= 1.3.0 +Requires: python-ipaddress >= 1.0.7 Requires: MySQL-python Requires: pyparsing >= 2.0.3 -Requires: python-barbicanclient >= 3.3.0 +Requires: python-barbicanclient >= 4.0.0 Requires: python-crypto >= 2.6 Requires: python-decorator >= 3.4.0 Requires: python-enum34 @@ -157,7 +156,7 @@ Requires: python-oslo-log >= 1.14.0 Requires: python-oslo-vmware >= 1.16.0 Requires: python-paste Requires: python-pbr >= 1.6 -Requires: python-requests >= 2.8.1 +Requires: python-requests >= 2.10.0 Requires: python-retrying >= 1.2.3 Requires: python-rtslib >= 2.1.fb41 Requires: python-simplejson >= 2.2.0 @@ -183,11 +182,11 @@ BuildRequires: graphviz # Required to build module documents BuildRequires: python-eventlet >= 0.18.2 BuildRequires: python-routes >= 1.12.3 -BuildRequires: python-sqlalchemy >= 0.9.9 +BuildRequires: python-sqlalchemy >= 1.0.10 BuildRequires: python-webob >= 1.2.3 # while not strictly required, quiets the build down when building docs. BuildRequires: python-migrate >= 0.9.6 -BuildRequires: python-iso8601 >= 0.1.9 +BuildRequires: python-iso8601 >= 0.1.11 %description doc OpenStack Volume (codename Cinder) provides services to manage and @@ -197,7 +196,8 @@ This package contains documentation files for cinder. %endif %prep -%autosetup -n cinder-%{version} +%setup -q -n cinder-%{version} + find . \( -name .gitignore -o -name .placeholder \) -delete @@ -207,16 +207,8 @@ find cinder -name \*.py -exec sed -i '/\/usr\/bin\/env python/{d;q}' {} + # to distutils requires_dist config rm -rf {test-,}requirements.txt tools/{pip,test}-requires - %build -# Generate config file -PYTHONPATH=. tools/config/generate_sample.sh from_tox - %{__python2} setup.py build - -%install -%{__python2} setup.py install -O1 --skip-build --root %{buildroot} - # docs generation requires everything to be installed first export PYTHONPATH="$( pwd ):$PYTHONPATH" @@ -231,12 +223,23 @@ rm -fr build/html/.doctrees build/html/.buildinfo # Create dir link to avoid a sphinx-build exception mkdir -p build/man/.doctrees/ ln -s . build/man/.doctrees/man -SPHINX_DEBUG=1 sphinx-build -b man -c source source/man build/man -mkdir -p %{buildroot}%{_mandir}/man1 -install -p -D -m 644 build/man/*.1 %{buildroot}%{_mandir}/man1/ +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 + +%install +%{__python2} setup.py install -O1 --skip-build --root %{buildroot} + +mkdir -p %{buildroot}%{_mandir}/man1 +install -p -D -m 644 doc/build/man/*.1 %{buildroot}%{_mandir}/man1/ + # Setup directories install -d -m 755 %{buildroot}%{_sharedstatedir}/cinder install -d -m 755 %{buildroot}%{_sharedstatedir}/cinder/tmp @@ -347,6 +350,10 @@ exit 0 %endif %changelog +* Tue Jun 28 2016 Mikhail Ivanov - 9.0.0~b1 +- Update to 9.0.0.0b1 +- Update build and runtime dependencies + * Wed Mar 09 2016 Alexander Tsamutali - 8.0.0.0b2-1 - Update to 8.0.0.0b3. - Sync with RDO spec.