diff --git a/.gitignore b/.gitignore index 6b10836..8fe59cc 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /oslo.service-0.9.0.tar.gz +/oslo.service-1.7.0.tar.gz diff --git a/Changelog.old b/Changelog.old new file mode 100644 index 0000000..47d106b --- /dev/null +++ b/Changelog.old @@ -0,0 +1,11 @@ +* Thu Feb 04 2016 Fedora Release Engineering - 0.9.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Tue Sep 15 2015 Haïkel Guémar - 0.9.0-2 +- Missing license in doc subpackage + +* Mon Sep 07 2015 Haïkel Guémar - 0.9.0-1 +- Upstream 0.9.0 + +* Thu Jun 18 2015 Haïkel Guémar - 0.1.0-1 +- Initial package. diff --git a/python-oslo-service.spec b/python-oslo-service.spec index 3f8fc74..fdcd30e 100644 --- a/python-oslo-service.spec +++ b/python-oslo-service.spec @@ -1,14 +1,15 @@ %global pypi_name oslo.service %global pname oslo-service -%if 0%{?fedora} -# FIXME: missing python3-oslo-concurrency -%global with_python3 0 +%if 0%{?fedora} >= 24 +%global with_python3 1 %endif +%{!?upstream_version: %global upstream_version %{version}%{?milestone}} + Name: python-%{pname} -Version: 0.9.0 -Release: 3%{?dist} +Version: 1.7.0 +Release: 1%{?dist} Summary: Oslo service library License: ASL 2.0 @@ -16,6 +17,10 @@ URL: http://launchpad.net/oslo Source0: https://pypi.python.org/packages/source/o/%{pypi_name}/%{pypi_name}-%{version}.tar.gz BuildArch: noarch +%package -n python2-%{pname} +Summary: Oslo service library +%{?python_provide:%python_provide python2-%{pname}} + BuildRequires: python2-devel BuildRequires: python-setuptools BuildRequires: python-pbr >= 1.3 @@ -27,16 +32,23 @@ BuildRequires: python-paste-deploy BuildRequires: python-eventlet BuildRequires: python-monotonic BuildRequires: python-six +# Required for documentation build +BuildRequires: python-oslo-config +# Required for tests +BuildRequires: procps-ng +BuildRequires: python-fixtures +BuildRequires: python-hacking +BuildRequires: python-mock +BuildRequires: python-requests +BuildRequires: python-routes +BuildRequires: python-oslotest +BuildRequires: python-oslo-log +BuildRequires: python-oslo-utils +BuildRequires: python-oslo-concurrency -%description -Library for running OpenStack services - - -%package -n python2-%{pname} -Summary: Oslo service library -%{?python_provide:%python_provide python2-%{pname}} Requires: python-babel Requires: python-eventlet >= 0.17.4 +Requires: python-greenlet Requires: python-monotonic >= 0.3 Requires: python-oslo-config >= 2.3.0 Requires: python-oslo-concurrency >= 2.3.0 @@ -45,7 +57,9 @@ Requires: python-oslo-log >= 1.8.0 Requires: python-oslo-utils >= 2.0.0 Requires: python-paste Requires: python-paste-deploy >= 1.5.0 +Requires: python-routes Requires: python-six >= 1.9.0 +Requires: python-webob %description -n python2-%{pname} @@ -60,8 +74,20 @@ Summary: Oslo service library BuildRequires: python3-devel BuildRequires: python3-setuptools BuildRequires: python3-pbr >= 1.3 +# Required for tests +BuildRequires: procps-ng +BuildRequires: python3-fixtures +BuildRequires: python3-hacking +BuildRequires: python3-mock +BuildRequires: python3-requests +BuildRequires: python3-oslotest +BuildRequires: python3-oslo-log +BuildRequires: python3-oslo-utils +BuildRequires: python3-oslo-concurrency + Requires: python3-babel Requires: python3-eventlet >= 0.17.4 +Requires: python3-greenlet Requires: python3-monotonic >= 0.3 Requires: python3-oslo-config >= 2.3.0 Requires: python3-oslo-concurrency >= 2.3.0 @@ -70,7 +96,9 @@ Requires: python3-oslo-log >= 1.8.0 Requires: python3-oslo-utils >= 2.0.0 Requires: python3-paste Requires: python3-paste-deploy >= 1.5.0 +Requires: python3-routes Requires: python3-six >= 1.9.0 +Requires: python3-webob %description -n python3-%{pname} @@ -82,10 +110,28 @@ Summary: Oslo service documentation %description -n python-%{pname}-doc Documentation for oslo.service +%package -n python-%{pname}-tests +Summary: Oslo service tests +%description -n python-%{pname}-tests +Tests for oslo.service + +Requires: python-%{pname} = %{version}-%{release} +Requires: procps-ng +Requires: python-fixtures +Requires: python-hacking +Requires: python-mock +Requires: python-requests +Requires: python-routes +Requires: python-oslotest +Requires: python-oslo-log +Requires: python-oslo-utils +Requires: python-oslo-concurrency + +%description +Library for running OpenStack services + %prep -%autosetup -n %{pypi_name}-%{version} -# Remove bundled egg-info -rm -rf %{pypi_name}.egg-info +%setup -q -n %{pypi_name}-%{upstream_version} %build %py2_build @@ -105,34 +151,39 @@ rm -rf html/.{doctrees,buildinfo} %endif %py2_install +%check +%if 0%{?with_python3} +%{__python3} setup.py test || +rm -rf .testrepository +%endif +# FIXME: https://review.openstack.org/279011 seems to break tests in CentOS7, +# creating an infinite loop +#%{__python2} setup.py test || %files -n python2-%{pname} %doc README.rst %license LICENSE %{python2_sitelib}/oslo_service -%{python2_sitelib}/%{pypi_name}-%{version}-py?.?.egg-info +%{python2_sitelib}/*.egg-info +%exclude %{python2_sitelib}/oslo_service/tests %if 0%{?with_python3} %files -n python3-%{pname} %doc README.rst %license LICENSE %{python3_sitelib}/oslo_service -%{python3_sitelib}/%{pypi_name}-%{version}-py?.?.egg-info +%{python3_sitelib}/*.egg-info +%exclude %{python3_sitelib}/oslo_service/tests %endif %files -n python-%{pname}-doc %doc html %license LICENSE -%changelog -* Thu Feb 04 2016 Fedora Release Engineering - 0.9.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild +%files -n python-%{pname}-tests +%{python2_sitelib}/oslo_service/tests -* Tue Sep 15 2015 Haïkel Guémar - 0.9.0-2 -- Missing license in doc subpackage - -* Mon Sep 07 2015 Haïkel Guémar - 0.9.0-1 -- Upstream 0.9.0 +%changelog +* Wed Mar 23 2016 Haikel Guemar 1.7.0- +- Update to 1.7.0 -* Thu Jun 18 2015 Haïkel Guémar - 0.1.0-1 -- Initial package. diff --git a/sources b/sources index 3839b79..4ce757f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e25add0e42b7cc1660d0b71b0571c6a3 oslo.service-0.9.0.tar.gz +39e7d92a1bb470d8695f3e0c3692df80 oslo.service-1.7.0.tar.gz