X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=rpm%2FSPECS%2Fopenstack-ceilometer.spec;h=dd3b5f2b2b1695b6c05269b4e7685b60be4294b8;hb=e9b69fab1e9e91746fbb7bb336795904f40768a3;hp=742c5d708fd99a5aa1b1d3b185491937781882a9;hpb=e5656b0a3d68cc084ee7488746312fa8470b8fdf;p=openstack-build%2Fceilometer-build.git diff --git a/rpm/SPECS/openstack-ceilometer.spec b/rpm/SPECS/openstack-ceilometer.spec index 742c5d7..dd3b5f2 100644 --- a/rpm/SPECS/openstack-ceilometer.spec +++ b/rpm/SPECS/openstack-ceilometer.spec @@ -3,15 +3,15 @@ %global pypi_name ceilometer Name: openstack-ceilometer -Version: 2013.1.3 -Release: 1%{?dist} +Version: 2013.2 +Release: 0.8.b3%{?dist} Summary: OpenStack measurement collection service Group: Applications/System License: ASL 2.0 URL: https://wiki.openstack.org/wiki/Ceilometer -Source0: http://tarballs.openstack.org/%{pypi_name}/%{pypi_name}-%{version}.tar.gz -Source1: %{pypi_name}.conf +Source0: http://tarballs.openstack.org/%{pypi_name}/%{pypi_name}-%{version}.b3.tar.gz +Source1: %{pypi_name}-dist.conf Source2: %{pypi_name}.logrotate Source10: %{name}-api.init @@ -24,10 +24,9 @@ Source13: %{name}-central.init Source130: %{name}-central.upstart # -# patches_base=2013.1.3 +# patches_base=2013.2.b3 # Patch0001: 0001-Ensure-we-don-t-access-the-net-when-building-docs.patch -Patch0002: 0002-avoid-code-path-causing-qpid-exchange-leaks.patch # This is EL6 specific and not upstream Patch100: openstack-ceilometer-newdeps.patch @@ -36,6 +35,8 @@ BuildArch: noarch BuildRequires: intltool BuildRequires: python-sphinx10 BuildRequires: python-setuptools +BuildRequires: python-pbr +BuildRequires: python-d2to1 BuildRequires: python2-devel BuildRequires: openstack-utils @@ -64,8 +65,12 @@ Requires: python-iso8601 Requires: python-lxml Requires: python-anyjson Requires: python-stevedore +Requires: python-msgpack +Requires: python-netaddr +Requires: python-six Requires: python-sqlalchemy0.7 +Requires: python-alembic Requires: python-migrate Requires: python-webob >= 1.2 @@ -143,7 +148,7 @@ Group: Applications/System Requires: %{name}-common = %{version}-%{release} -Requires: pymongo +Requires: python-pymongo %description collector OpenStack ceilometer provides services to measure and @@ -158,7 +163,7 @@ Group: Applications/System Requires: %{name}-common = %{version}-%{release} -Requires: pymongo +Requires: python-pymongo Requires: python-flask Requires: python-pecan Requires: python-wsme @@ -193,7 +198,6 @@ This package contains documentation files for ceilometer. %setup -q -n ceilometer-%{version} %patch0001 -p1 -%patch0002 -p1 # Apply EL6 patch %patch100 -p1 @@ -205,6 +209,20 @@ find ceilometer -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 + +# Programmatically update defaults in sample config +# which is installed at /etc/ceilometer/ceilometer.conf +# TODO: Make this more robust +# Note it only edits the first occurance, so assumes a section ordering in sample +# and also doesn't support multi-valued variables. +while read name eq value; do + test "$name" && test "$value" || continue + sed -i "0,/^# *$name=/{s!^# *$name=.*!#$name=$value!}" etc/ceilometer/ceilometer.conf.sample +done < %{SOURCE1} + %build %{__python} setup.py build @@ -231,7 +249,8 @@ install -d -m 755 %{buildroot}%{_localstatedir}/log/ceilometer # Install config files install -d -m 755 %{buildroot}%{_sysconfdir}/ceilometer -install -p -D -m 640 %{SOURCE1} %{buildroot}%{_sysconfdir}/ceilometer/ceilometer.conf +install -p -D -m 640 %{SOURCE1} %{buildroot}%{_datadir}/ceilometer/ceilometer-dist.conf +install -p -D -m 640 etc/ceilometer/ceilometer.conf.sample %{buildroot}%{_sysconfdir}/ceilometer/ceilometer.conf install -p -D -m 640 etc/ceilometer/policy.json %{buildroot}%{_sysconfdir}/ceilometer/policy.json install -p -D -m 640 etc/ceilometer/sources.json %{buildroot}%{_sysconfdir}/ceilometer/sources.json install -p -D -m 640 etc/ceilometer/pipeline.yaml %{buildroot}%{_sysconfdir}/ceilometer/pipeline.yaml @@ -363,6 +382,7 @@ fi %files common %doc LICENSE %dir %{_sysconfdir}/ceilometer +%attr(-, root, ceilometer) %{_datadir}/ceilometer/ceilometer-dist.conf %config(noreplace) %attr(-, root, ceilometer) %{_sysconfdir}/ceilometer/ceilometer.conf %config(noreplace) %attr(-, root, ceilometer) %{_sysconfdir}/ceilometer/policy.json %config(noreplace) %attr(-, root, ceilometer) %{_sysconfdir}/ceilometer/sources.json @@ -416,18 +436,30 @@ fi %changelog -* Tue Aug 13 2013 Matthias Runge - 2013.1.3-1 -- rebase to 2013.1.3 +* Mon Sep 10 2013 Pádraig Brady - 2013.2-0.8.b3 +- Depend on python-pymongo rather than pymongo to avoid a puppet bug + +* Mon Sep 9 2013 Pádraig Brady - 2013.2-0.7.b3 +- Depend on python-alembic -* Fri Jun 21 2013 Pádraig Brady - 2013.1.2-2 -- Avoid qpid exchange leaks +* Mon Sep 9 2013 Pádraig Brady - 2013.2-0.6.b3 +- Distribute dist defaults in ceilometer-dist.conf separate to user ceilometer.conf -* Thu Jun 6 2013 Pádraig Brady - 2013.1.2-1 -- Update to stable/grizzly release 2013.1.2 +* Mon Sep 9 2013 Pádraig Brady - 2013.2-0.5.b3 +- Update to Havana milestone 3 -* Thu Jun 6 2013 Pádraig Brady - 2013.1-3 +* Tue Aug 27 2013 Pádraig Brady - 2013.2-0.4.b1 +- Avoid python runtime dependency management + +* Sat Aug 03 2013 Fedora Release Engineering - 2013.2-0.3.b1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Thu Jun 6 2013 Pádraig Brady - 2013.2-0.2.b1 - Fix uninstall for openstack-ceilometer-central +* Fri May 31 2013 Pádraig Brady - 2013.2-0.1.b1 +- Havana milestone 1 + * Mon Apr 8 2013 Pádraig Brady - 2013.1-2 - Grizzly release