diff --git a/.gitignore b/.gitignore index e3e8b25..2bc8c19 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ /oslo.config-2.0.0.tar.gz /oslo.config-2.2.0.tar.gz /oslo.config-2.4.0.tar.gz +/oslo.config-3.9.0.tar.gz diff --git a/Changelog.old b/Changelog.old new file mode 100644 index 0000000..0301c4b --- /dev/null +++ b/Changelog.old @@ -0,0 +1,75 @@ +* Thu Feb 04 2016 Fedora Release Engineering - 2:2.4.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Mon Nov 23 2015 Parag Nemade - 2:2.4.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5 + +* Thu Sep 03 2015 Alan Pevec 2:2.4.0-1 +- Update to upstream 2.4.0 + +* Mon Aug 17 2015 Alan Pevec 2:2.2.0-1 +- Update to upstream 2.2.0 + +* Thu Jul 23 2015 Alan Pevec 2:2.0.0-1 +- Update to upstream 2.0.0 + +* Thu Jun 25 2015 Alan Pevec 2:1.12.1-1 +- Update to upstream 1.12.1 + +* Thu Jun 18 2015 Fedora Release Engineering - 2:1.9.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Fri Mar 27 2015 Alan Pevec 2:1.9.3-1 +- Update to upstream 1.9.3 + +* Mon Feb 23 2015 Alan Pevec 2:1.7.0-1 +- Update to upstream 1.7.0 + +* Sat Sep 20 2014 Alan Pevec - 2:1.4.0 +- Final 1.4.0 release, Epoch bumped to make 1.4.0 win over 1.4.0.0 + +* Wed Sep 17 2014 Alan Pevec - 1:1.4.0.0-0.4.a5 +- Update to 1.4.0.0a5 milestone + +* Wed Sep 17 2014 Haïkel Guémar - 1:1.4.0.0-0.3.a3 +- Rename python3 subpackage + +* Mon Sep 15 2014 Haïkel Guémar - 1:1.4.0.0-0.2.a3 +- Add python3 subpackage + +* Sat Jun 07 2014 Fedora Release Engineering - 1:1.2.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Fri Oct 11 2013 Alan Pevec - 1.2.1-1 +- Update to 1.2.1 + +* Tue Aug 20 2013 apevec@redhat.com 1.2.0-0.5.a3 +- Look also for $prog-dist.conf for glance-manage + +* Thu Aug 8 2013 pbrady@redhat.com - 1:1.2.0-0.4.a3 +- Look for /usr/share/$project/$project-dist.conf by default + +* Sun Aug 04 2013 Fedora Release Engineering - 1:1.2.0-0.3.a3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Sun Jul 21 2013 pbrady@redhat.com - 1:1.2.0-0.2.a3 +- Update to 1.2.0a3 milestone + +* Mon Jun 24 2013 apevec@redhat.com - 1:1.2.0-0.1.a2 +- Update to 1.2.0a2 milestone + +* Tue Mar 12 2013 Mark McLoughlin - 1:1.1.0-1 +- Update to 1.1.0 final. + +* Wed Mar 6 2013 Mark McLoughlin - 1.1.0-0.1.b1 +- Update to 1.1.0b1, bump epoch + +* Tue Mar 5 2013 Mark McLoughlin - 2013.1-0.1.b5 +- Update to 2013.1b5 +- Require python-argparse (#917937) + +* Fri Feb 22 2013 Mark McLoughlin - 2013.1-0.1.b4 +- Update to 2013.1b4 + +* Sun Feb 17 2013 Mark McLoughlin - 2013.1-0.1.b3 +- Initial package (#912023). diff --git a/python-oslo-config.spec b/python-oslo-config.spec index 74538a5..0c4e517 100644 --- a/python-oslo-config.spec +++ b/python-oslo-config.spec @@ -9,14 +9,14 @@ Name: python-oslo-config Epoch: 2 -Version: 2.4.0 -Release: 3%{?dist} +Version: 3.9.0 +Release: 1%{?dist} Summary: OpenStack common configuration library Group: Development/Languages License: ASL 2.0 URL: https://launchpad.net/oslo -Source0: https://pypi.python.org/packages/source/o/%{sname}/%{sname}-%{version}.tar.gz +Source0: http://tarballs.openstack.org/oslo.config/oslo.config-%{upstream_version}.tar.gz Patch0001: 0001-add-usr-share-project-dist.conf-to-the-default-confi.patch @@ -38,17 +38,17 @@ Summary: OpenStack common configuration library Provides: python-%{pypi_name} = %{epoch}:%{upstream_version} Obsoletes: python-%{pypi_name} < %{epoch}:%{upstream_version} -Requires: python-setuptools Requires: python-argparse -Requires: python-six >= 1.9.0 Requires: python-netaddr -Requires: python-stevedore Requires: python-pbr +Requires: python-setuptools +Requires: python-six >= 1.9.0 +Requires: python-stevedore BuildRequires: python2-devel BuildRequires: python-setuptools BuildRequires: python-pbr -BuildRequires: python-oslotest +BuildRequires: git %description -n python2-%{pypi_name} The Oslo project intends to produce a python library containing @@ -66,10 +66,11 @@ Summary: Documentation for OpenStack common configuration library Provides: python-%{pypi_name}-doc = %{epoch}:%{upstream_version} Obsoletes: python-%{pypi_name}-doc < %{epoch}:%{upstream_version} -BuildRequires: python-sphinx BuildRequires: python-fixtures -BuildRequires: python-oslo-sphinx >= 2.3.0 BuildRequires: python-netaddr +BuildRequires: python-oslo-sphinx >= 2.3.0 +BuildRequires: python-oslotest >= 1.10.0 +BuildRequires: python-sphinx BuildRequires: python-stevedore %description -n python2-%{pypi_name}-doc @@ -80,21 +81,23 @@ Documentation for the oslo-config library. Summary: OpenStack common configuration library %{?python_provide:%python_provide python3-%{pypi_name}} +Requires: python3-netaddr +Requires: python3-pbr Requires: python3-setuptools Requires: python3-six >= 1.9.0 -Requires: python3-netaddr Requires: python3-stevedore -Requires: python3-pbr BuildRequires: python3-devel +BuildRequires: python3-pbr BuildRequires: python3-setuptools +BuildRequires: git +# Required for tests +BuildRequires: python3-fixtures BuildRequires: python3-netaddr +BuildRequires: python3-oslo-sphinx >= 2.3.0 +BuildRequires: python3-oslotest >= 1.10.0 +BuildRequires: python3-six >= 1.9.0 BuildRequires: python3-stevedore -BuildRequires: python3-pbr -# FIXME when python3-oslotest is available -# Depends on python-mox3 under review: -# https://bugzilla.redhat.com/show_bug.cgi?id=1259333 -#BuildRequires: python3-oslotest %description -n python3-%{pypi_name} The Oslo project intends to produce a python library containing @@ -107,9 +110,7 @@ parsing library from the Oslo project. %endif %prep -%setup -q -n %{sname}-%{upstream_version} - -%patch0001 -p1 +%autosetup -n %{sname}-%{upstream_version} -S git # let RPM handle deps rm -rf {test-,}requirements.txt @@ -130,9 +131,6 @@ mv %{buildroot}%{_bindir}/oslo-config-generator \ %endif %{__python2} setup.py install -O1 --skip-build --root %{buildroot} -# Delete tests -rm -fr %{buildroot}%{python2_sitelib}/tests - export PYTHONPATH="$( pwd ):$PYTHONPATH" pushd doc sphinx-build -b html -d build/doctrees source build/html @@ -141,8 +139,8 @@ popd %check %{__python2} setup.py test %if 0%{?with_python3} -# FIXME when python3-oslotest is available -#%{__python3} setup.py test +rm -rf .testrepository +%{__python3} setup.py test %endif %files -n python2-%{pypi_name} @@ -166,78 +164,6 @@ popd %endif %changelog -* Thu Feb 04 2016 Fedora Release Engineering - 2:2.4.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Mon Nov 23 2015 Parag Nemade - 2:2.4.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5 - -* Thu Sep 03 2015 Alan Pevec 2:2.4.0-1 -- Update to upstream 2.4.0 - -* Mon Aug 17 2015 Alan Pevec 2:2.2.0-1 -- Update to upstream 2.2.0 - -* Thu Jul 23 2015 Alan Pevec 2:2.0.0-1 -- Update to upstream 2.0.0 - -* Thu Jun 25 2015 Alan Pevec 2:1.12.1-1 -- Update to upstream 1.12.1 - -* Thu Jun 18 2015 Fedora Release Engineering - 2:1.9.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Fri Mar 27 2015 Alan Pevec 2:1.9.3-1 -- Update to upstream 1.9.3 - -* Mon Feb 23 2015 Alan Pevec 2:1.7.0-1 -- Update to upstream 1.7.0 - -* Sat Sep 20 2014 Alan Pevec - 2:1.4.0 -- Final 1.4.0 release, Epoch bumped to make 1.4.0 win over 1.4.0.0 - -* Wed Sep 17 2014 Alan Pevec - 1:1.4.0.0-0.4.a5 -- Update to 1.4.0.0a5 milestone - -* Wed Sep 17 2014 Haïkel Guémar - 1:1.4.0.0-0.3.a3 -- Rename python3 subpackage - -* Mon Sep 15 2014 Haïkel Guémar - 1:1.4.0.0-0.2.a3 -- Add python3 subpackage - -* Sat Jun 07 2014 Fedora Release Engineering - 1:1.2.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Fri Oct 11 2013 Alan Pevec - 1.2.1-1 -- Update to 1.2.1 - -* Tue Aug 20 2013 apevec@redhat.com 1.2.0-0.5.a3 -- Look also for $prog-dist.conf for glance-manage - -* Thu Aug 8 2013 pbrady@redhat.com - 1:1.2.0-0.4.a3 -- Look for /usr/share/$project/$project-dist.conf by default - -* Sun Aug 04 2013 Fedora Release Engineering - 1:1.2.0-0.3.a3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Sun Jul 21 2013 pbrady@redhat.com - 1:1.2.0-0.2.a3 -- Update to 1.2.0a3 milestone - -* Mon Jun 24 2013 apevec@redhat.com - 1:1.2.0-0.1.a2 -- Update to 1.2.0a2 milestone - -* Tue Mar 12 2013 Mark McLoughlin - 1:1.1.0-1 -- Update to 1.1.0 final. - -* Wed Mar 6 2013 Mark McLoughlin - 1.1.0-0.1.b1 -- Update to 1.1.0b1, bump epoch - -* Tue Mar 5 2013 Mark McLoughlin - 2013.1-0.1.b5 -- Update to 2013.1b5 -- Require python-argparse (#917937) - -* Fri Feb 22 2013 Mark McLoughlin - 2013.1-0.1.b4 -- Update to 2013.1b4 +* Thu Mar 17 2016 Haikel Guemar 2:3.9.0- +- Update to 3.9.0 -* Sun Feb 17 2013 Mark McLoughlin - 2013.1-0.1.b3 -- Initial package (#912023). diff --git a/sources b/sources index 0da1d2a..a67106d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d46e98ba78d83c982c4beb55212a3048 oslo.config-2.4.0.tar.gz +fae8a9828c4524a3da71f99d3cd925f7 oslo.config-3.9.0.tar.gz