X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=rpm%2FSPECS%2Fopenstack-cinder.spec;h=7bcec366372be686e0e8a763741b86b94beb7485;hb=a3e62fd80133aa7f41869ce64497d4ad58cafcbb;hp=1830b3e172f55928bf38b78927fd26b32b178ed7;hpb=19ab6ca2ac555f84995c9153a467496501c0361b;p=openstack-build%2Fcinder-build.git diff --git a/rpm/SPECS/openstack-cinder.spec b/rpm/SPECS/openstack-cinder.spec index 1830b3e17..7bcec3663 100644 --- a/rpm/SPECS/openstack-cinder.spec +++ b/rpm/SPECS/openstack-cinder.spec @@ -1,14 +1,14 @@ %global with_doc %{!?_without_doc:1}%{?_without_doc:0} Name: openstack-cinder -Version: 2013.1.2 -Release: 4%{?dist} +Version: 2013.2 +Release: 0.8.b3%{?dist} Summary: OpenStack Volume service Group: Applications/System License: ASL 2.0 URL: http://www.openstack.org/software/openstack-storage/ -Source0: https://launchpad.net/cinder/grizzly/%{version}/+download/cinder-%{version}.tar.gz +Source0: https://launchpad.net/cinder/havana/havana-3/+download/cinder-%{version}.b3.tar.gz Source1: cinder.conf Source2: cinder.logrotate Source3: cinder-tgt.conf @@ -19,28 +19,31 @@ Source11: openstack-cinder-scheduler.init Source110: openstack-cinder-scheduler.upstart Source12: openstack-cinder-volume.init Source120: openstack-cinder-volume.upstart +Source13: openstack-cinder-backup.init +Source130: openstack-cinder-backup.upstart Source20: cinder-sudoers # -# patches_base=2013.1.2 +# patches_base=2013.2.b3 # Patch0001: 0001-Ensure-we-don-t-access-the-net-when-building-docs.patch Patch0002: 0002-Use-updated-parallel-install-versions-of-epel-packag.patch -Patch0003: 0003-remove-deprecated-assert_unicode-sqlalchemy-attribut.patch -Patch0004: 0004-avoid-code-path-causing-qpid-exchange-leaks.patch +Patch0003: 0003-Remove-runtime-dep-on-python-pbr-python-d2to1.patch +Patch0004: 0004-Revert-Use-oslo.sphinx-and-remove-local-copy-of-doc-.patch BuildArch: noarch BuildRequires: intltool +BuildRequires: python-d2to1 +BuildRequires: python-pbr BuildRequires: python-sphinx10 BuildRequires: python-setuptools BuildRequires: python-netaddr BuildRequires: openstack-utils -# These are required to build due to the requirements check added BuildRequires: python-paste-deploy1.5 BuildRequires: python-routes1.12 BuildRequires: python-sqlalchemy0.7 -BuildRequires: python-webob1.0 +BuildRequires: python-webob1.2 Requires: openstack-utils Requires: python-cinder = %{version}-%{release} @@ -66,9 +69,11 @@ Summary: OpenStack Volume Python libraries Group: Applications/System Requires: sudo + Requires: MySQL-python Requires: qemu-img +Requires: sysfsutils Requires: python-paramiko @@ -91,11 +96,18 @@ Requires: python-migrate Requires: python-paste-deploy1.5 Requires: python-routes1.12 -Requires: python-webob1.0 +Requires: python-webob1.2 Requires: python-glanceclient >= 1:0 +Requires: python-swiftclient >= 1.2 Requires: python-keystoneclient +Requires: python-novaclient >= 2.14 + Requires: python-oslo-config +Requires: python-six + +Requires: python-babel +Requires: python-lockfile %description -n python-cinder OpenStack Volume (codename Cinder) provides services to manage and @@ -116,7 +128,7 @@ BuildRequires: graphviz BuildRequires: python-eventlet BuildRequires: python-routes1.12 BuildRequires: python-sqlalchemy0.7 -BuildRequires: python-webob1.0 +BuildRequires: python-webob1.2 # while not strictly required, quiets the build down when building docs. BuildRequires: python-migrate, python-iso8601 @@ -142,6 +154,14 @@ find cinder -name \*.py -exec sed -i '/\/usr\/bin\/env python/{d;q}' {} + # TODO: Have the following handle multi line entries sed -i '/setup_requires/d; /install_requires/d; /dependency_links/d' setup.py +# Remove the requirements file so that pbr hooks don't add it +# to distutils requires_dist config +rm -rf {test-,}requirements.txt tools/{pip,test}-requires + +# We add REDHATCINDERVERSION/RELEASE with the pbr removal patch +sed -i s/REDHATCINDERVERSION/%{version}/ cinder/version.py +sed -i s/REDHATCINDERRELEASE/%{release}/ cinder/version.py + %build # Move authtoken configuration out of paste.ini @@ -195,6 +215,7 @@ install -p -D -m 640 etc/cinder/policy.json %{buildroot}%{_sysconfdir}/cinder/po install -p -D -m 755 %{SOURCE10} %{buildroot}%{_initrddir}/openstack-cinder-api install -p -D -m 755 %{SOURCE11} %{buildroot}%{_initrddir}/openstack-cinder-scheduler install -p -D -m 755 %{SOURCE12} %{buildroot}%{_initrddir}/openstack-cinder-volume +install -p -D -m 755 %{SOURCE13} %{buildroot}%{_initrddir}/openstack-cinder-backup # Install sudoers install -p -D -m 440 %{SOURCE20} %{buildroot}%{_sysconfdir}/sudoers.d/cinder @@ -210,6 +231,7 @@ install -d -m 755 %{buildroot}%{_datadir}/cinder install -p -m 644 %{SOURCE100} %{buildroot}%{_datadir}/cinder/ install -p -m 644 %{SOURCE110} %{buildroot}%{_datadir}/cinder/ install -p -m 644 %{SOURCE120} %{buildroot}%{_datadir}/cinder/ +install -p -m 644 %{SOURCE130} %{buildroot}%{_datadir}/cinder/ # Install rootwrap files in /usr/share/cinder/rootwrap mkdir -p %{buildroot}%{_datarootdir}/cinder/rootwrap/ @@ -288,17 +310,26 @@ fi %endif %changelog -* Mon Jul 22 2013 Pádraig Brady - 2013.1.2-4 +* Mon Sep 9 2013 Eric Harney - 2013.2-0.8.b3 +- Update to Havana milestone 3 +- Add dependency on python-novaclient + +* Thu Aug 29 2013 Pádraig Brady - 2013.2-0.7.b2 +- Add dependency on sysfsutils to support the fiber channel driver + +* Mon Aug 26 2013 Eric Harney - 2013.2-0.5.b2 +- Add cinder-backup service init script + +* Mon Jul 22 2013 Pádraig Brady - 2013.2-0.4.b2 - Add dependency on python-suds to support the netapp driver - Add dependency on python-keystoneclient for auth token middleware -- Add dependency on python-oslo-config new in Grizzly - Add dependency on qemu-img for volume creation from Glance images -* Wed Jul 17 2013 Pádraig Brady - 2013.1.2-2 -- Avoid qpid exchange leaks +* Sun Jul 21 2013 Pádraig Brady - 2013.2-0.3.b2 +- Update to Havana milestone 2 -* Mon Jun 20 2013 Eric Harney - 2013.1.2-1 -- Update to Grizzly stable release 2 +* Thu Jun 13 2013 Eric Harney - 2013.2-0.2.b1 +- Update to Havana milestone 1 * Fri May 10 2013 Eric Harney - 2013.1.1-1 - Update to Grizzly stable release 1 @@ -310,7 +341,7 @@ fi * Thu Apr 04 2013 Eric Harney - 2013.1-1 - Update to Grizzly final release -* Mon Mar 27 2013 Eric Harney - 2013.1-0.5.rc3 +* Wed Mar 27 2013 Eric Harney - 2013.1-0.5.rc3 - Update to Grizzly RC3 release * Mon Mar 25 2013 Eric Harney - 2013.1-0.5.rc2