From eb85461c910b091c5baf20782f6c579966437dab Mon Sep 17 00:00:00 2001 From: Haikel Guemar Date: Apr 15 2016 09:37:24 +0000 Subject: Update to 3.6.0 --- diff --git a/.gitignore b/.gitignore index a6c3f05..c0a270f 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /oslo.concurrency-2.4.0.tar.gz /oslo.concurrency-2.5.0.tar.gz /oslo.concurrency-2.6.0.tar.gz +/oslo.concurrency-3.6.0.tar.gz diff --git a/Changelog.old b/Changelog.old new file mode 100644 index 0000000..6e735db --- /dev/null +++ b/Changelog.old @@ -0,0 +1,30 @@ +* Thu Feb 04 2016 Fedora Release Engineering - 2.6.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Fri Sep 18 2015 Alan Pevec 2.6.0-1 +- Update to upstream 2.6.0 + +* Thu Sep 03 2015 Alan Pevec 2.5.0-1 +- Update to upstream 2.5.0 + +* Mon Aug 17 2015 Alan Pevec 2.4.0-1 +- Update to upstream 2.4.0 + +* Fri Jun 26 2015 Alan Pevec 2.1.0-1 +- Update to upstream 2.1.0 + +* Thu Jun 18 2015 Fedora Release Engineering - 1.8.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Wed Apr 01 2015 Alan Pevec - 1.8.0-1 +- update to 1.8.0 + +* Wed Mar 11 2015 Matthias Runge - 1.6.0-1 +- upgrade to 1.6.0 + +* Fri Feb 20 2015 Matthias Runge - 1.4.1-2 +- added openstack/common/fileutils.py +- added dependencies + +* Wed Jan 28 2015 Matthias Runge - 1.4.1-1 +- Initial package (rhbz#1186826) diff --git a/python-oslo-concurrency.spec b/python-oslo-concurrency.spec index b4919a4..f4957b3 100644 --- a/python-oslo-concurrency.spec +++ b/python-oslo-concurrency.spec @@ -1,9 +1,15 @@ +%if 0%{?fedora} >= 24 +%global with_python3 1 +%endif + +%{!?upstream_version: %global upstream_version %{version}%{?milestone}} + %global pypi_name oslo.concurrency %global pkg_name oslo-concurrency Name: python-oslo-concurrency -Version: 2.6.0 -Release: 2%{?dist} +Version: 3.6.0 +Release: 1%{?dist} Summary: OpenStack Oslo concurrency library License: ASL 2.0 @@ -11,8 +17,20 @@ URL: https://launchpad.net/oslo Source0: https://pypi.python.org/packages/source/o/%{pypi_name}/%{pypi_name}-%{version}.tar.gz BuildArch: noarch +%package -n python2-%{pkg_name} +Summary: OpenStack Oslo concurrency library +%{?python_provide:%python_provide python2-%{pkg_name}} + BuildRequires: python2-devel BuildRequires: python-pbr +# Required for tests +BuildRequires: python-hacking +BuildRequires: python-oslotest +BuildRequires: python-coverage +BuildRequires: python-futures +BuildRequires: python-fixtures +BuildRequires: python-enum34 +BuildRequires: python-eventlet Requires: python-babel Requires: python-iso8601 @@ -20,16 +38,18 @@ Requires: python-fixtures Requires: python-oslo-config Requires: python-oslo-i18n Requires: python-oslo-utils +Requires: python-posix_ipc Requires: python-retrying Requires: python-six Requires: python-fasteners +Requires: python-enum34 -%description +%description -n python2-%{pkg_name} Oslo concurrency library has utilities for safely running multi-thread, multi-process applications using locking mechanisms and for running external processes. -%package doc +%package -n python-%{pkg_name}-doc Summary: Documentation for the Oslo concurrency library Group: Documentation @@ -39,67 +59,114 @@ BuildRequires: python-fixtures BuildRequires: python-oslo-utils BuildRequires: python-fasteners -%description doc +%description -n python-%{pkg_name}-doc Documentation for the Oslo concurrency library. +%package -n python-%{pkg_name}-tests +Summary: Tests for the Oslo concurrency library + +Requires: python-%{pkg_name} = %{version}-%{release} +Requires: python-hacking +Requires: python-oslotest +Requires: python-coverage +Requires: python-futures +Requires: python-fixtures + +%description -n python-%{pkg_name}-tests +Tests for the Oslo concurrency library. + +%if 0%{?with_python3} +%package -n python3-%{pkg_name} +Summary: OpenStack Oslo concurrency library +%{?python_provide:%python_provide python3-%{pkg_name}} + +BuildRequires: python3-devel +BuildRequires: python3-pbr +# Required for tests +BuildRequires: python3-hacking +BuildRequires: python3-oslotest +BuildRequires: python3-coverage +BuildRequires: python3-fixtures +BuildRequires: python3-eventlet + +Requires: python3-babel +Requires: python3-iso8601 +Requires: python3-fixtures +Requires: python3-oslo-config +Requires: python3-oslo-i18n +Requires: python3-oslo-utils +Requires: python3-posix_ipc +Requires: python3-retrying +Requires: python3-six +Requires: python3-fasteners + +%description -n python3-%{pkg_name} +Oslo concurrency library has utilities for safely running multi-thread, +multi-process applications using locking mechanisms and for running +external processes. +%endif + +%description +Oslo concurrency library has utilities for safely running multi-thread, +multi-process applications using locking mechanisms and for running +external processes. + %prep -%setup -q -n %{pypi_name}-%{version} +%setup -q -n %{pypi_name}-%{upstream_version} # Let RPM handle the dependencies -rm -f requirements.txt +rm -rf {test-,}requirements.txt %build -%{__python2} setup.py build +%py2_build +%if 0%{?with_python3} +%py3_build +%endif # generate html docs sphinx-build doc/source html # remove the sphinx-build leftovers rm -rf html/.{doctrees,buildinfo} -%install -%{__python2} setup.py install --skip-build --root %{buildroot} - -#delete tests -rm -fr %{buildroot}%{python2_sitelib}/%{pypi_name}/tests/ -%files +%install +%py2_install +%if 0%{?with_python3} +%py3_install +%endif + +%check +%{__python2} setup.py test ||: +%if 0%{?with_python3} +rm -rf .testrepository +%{__python3} setup.py test ||: +%endif + +%files -n python2-%{pkg_name} %doc README.rst %license LICENSE %{_bindir}/lockutils-wrapper %{python2_sitelib}/oslo_concurrency %{python2_sitelib}/*.egg-info +%exclude %{python2_sitelib}/oslo_concurrency/tests -%files doc +%files -n python-%{pkg_name}-doc %license LICENSE %doc html -%changelog -* Thu Feb 04 2016 Fedora Release Engineering - 2.6.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Fri Sep 18 2015 Alan Pevec 2.6.0-1 -- Update to upstream 2.6.0 +%files -n python-%{pkg_name}-tests +%{python2_sitelib}/oslo_concurrency/tests -* Thu Sep 03 2015 Alan Pevec 2.5.0-1 -- Update to upstream 2.5.0 -* Mon Aug 17 2015 Alan Pevec 2.4.0-1 -- Update to upstream 2.4.0 - -* Fri Jun 26 2015 Alan Pevec 2.1.0-1 -- Update to upstream 2.1.0 - -* Thu Jun 18 2015 Fedora Release Engineering - 1.8.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Wed Apr 01 2015 Alan Pevec - 1.8.0-1 -- update to 1.8.0 - -* Wed Mar 11 2015 Matthias Runge - 1.6.0-1 -- upgrade to 1.6.0 +%if 0%{?with_python3} +%files -n python3-%{pkg_name} +%doc README.rst +%license LICENSE +%{python3_sitelib}/oslo_concurrency +%{python3_sitelib}/*.egg-info +%exclude %{python3_sitelib}/oslo_concurrency/tests +%endif -* Fri Feb 20 2015 Matthias Runge - 1.4.1-2 -- added openstack/common/fileutils.py -- added dependencies +%changelog +* Wed Mar 23 2016 Haikel Guemar 3.6.0- +- Update to 3.6.0 -* Wed Jan 28 2015 Matthias Runge - 1.4.1-1 -- Initial package (rhbz#1186826) diff --git a/sources b/sources index 6189f81..96de90c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -aad7b284c47bc6bdaff80fb4594c6605 oslo.concurrency-2.6.0.tar.gz +432b0eec5f707975567e87d06f36f6b2 oslo.concurrency-3.6.0.tar.gz