From 55cfbecf95a9836686449ab76ad4a6f275af734f Mon Sep 17 00:00:00 2001 From: Haikel Guemar Date: Apr 15 2016 17:27:27 +0000 Subject: Update to 1.3.0 --- diff --git a/.gitignore b/.gitignore index 295159c..a83f384 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /debtcollector-0.5.0.tar.gz /debtcollector-0.7.0.tar.gz /debtcollector-0.8.0.tar.gz +/debtcollector-1.3.0.tar.gz diff --git a/Changelog.old b/Changelog.old new file mode 100644 index 0000000..e2ce145 --- /dev/null +++ b/Changelog.old @@ -0,0 +1,33 @@ +* Thu Feb 04 2016 Fedora Release Engineering - 0.8.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Tue Nov 10 2015 Fedora Release Engineering - 0.8.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5 + +* Fri Sep 18 2015 Alan Pevec 0.8.0-1 +- Update to upstream 0.8.0 + +* Mon Sep 07 2015 Chandan Kumar 0.7.0-3 +- Fixed obseletes +- Fixed package namespaces + +* Wed Sep 02 2015 Chandan Kumar 0.7.0-2 +- Added python 2 and python 3 subpackage + +* Wed Aug 05 2015 Alan Pevec 0.7.0-1 +- Update to upstream 0.7.0 + +* Sun Jun 28 2015 Alan Pevec 0.5.0-1 +- Update to upstream 0.5.0 + +* Thu Jun 18 2015 Fedora Release Engineering - 0.3.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Fri Mar 27 2015 Chandan Kumar - 0.3.0-3 +- Fixed jquery doc issues + +* Wed Mar 25 2015 Chandan Kumar - 0.3.0-2 +- Fixed doc and license macro in spec file + +* Tue Mar 10 2015 Chandan Kumar - 0.3.0-1 +- Initial Package diff --git a/python-debtcollector.spec b/python-debtcollector.spec index 294afc5..6358e32 100644 --- a/python-debtcollector.spec +++ b/python-debtcollector.spec @@ -1,21 +1,21 @@ -%{!?_licensedir:%global license %%doc} %global pypi_name debtcollector -%if 0%{?fedora} +%if 0%{?fedora} >=24 %global with_python3 1 %endif -Name: python-debtcollector -Version: 0.8.0 -Release: 3%{?dist} +%{!?upstream_version: %global upstream_version %{version}%{?milestone}} + +Name: python-%{pypi_name} +Version: 1.3.0 +Release: 1%{?dist} Summary: A collection of Python deprecation patterns and strategies License: ASL 2.0 URL: https://pypi.python.org/pypi/%{pypi_name} -Source0: https://pypi.python.org/packages/source/d/%{pypi_name}/%{pypi_name}-%{version}.tar.gz +Source0: http://tarballs.openstack.org/%{pypi_name}/%{pypi_name}-%{upstream_version}.tar.gz BuildArch: noarch - %description It is a collection of functions/decorators which is used to signal a user when * a method (static method, class method, or regular instance method) or a class @@ -24,23 +24,21 @@ It is a collection of functions/decorators which is used to signal a user when * a keyword is renamed * further customizing the emitted messages -%package -n python2-debtcollector +%package -n python2-%{pypi_name} Summary: A collection of Python deprecation patterns and strategies %{?python_provide:%python_provide python2-%{pypi_name}} -# python_provide does not exist in CBS Cloud buildroot -Provides: python-debtcollector = %{version}-%{release} -Obsoletes: python-debtcollector < 0.7.0-3 BuildRequires: python2-devel BuildRequires: python-setuptools BuildRequires: python-pbr Requires: python-babel -Requires: python-pbr >= 1.3.0 -Requires: python-six >= 1.9.0 +Requires: python-pbr +Requires: python-six Requires: python-wrapt -%description -n python2-debtcollector + +%description -n python2-%{pypi_name} It is a collection of functions/decorators which is used to signal a user when * a method (static method, class method, or regular instance method) or a class or function is going to be removed at some point in the future. @@ -48,35 +46,31 @@ It is a collection of functions/decorators which is used to signal a user when * a keyword is renamed * further customizing the emitted messages -%package -n python2-debtcollector-doc +%package -n python-%{pypi_name}-doc Summary: Documentation for the debtcollector module -%{?python_provide:%python_provide python2-%{pypi_name}-doc} -# python_provide does not exist in CBS Cloud buildroot -Provides: python-debtcollector-doc = %{version}-%{release} -Obsoletes: python-debtcollector-doc < 0.7.0-3 BuildRequires: python-sphinx BuildRequires: python-oslo-sphinx -BuildRequires: python-six >= 1.9.0 -BuildRequires: dos2unix +BuildRequires: python-six -%description -n python2-debtcollector-doc +%description -n python-%{pypi_name}-doc Documentation for the debtcollector module %if 0%{?with_python3} -%package -n python3-debtcollector +%package -n python3-%{pypi_name} Summary: A collection of Python deprecation patterns and strategies %{?python_provide:%python_provide python3-%{pypi_name}} + BuildRequires: python3-devel BuildRequires: python3-setuptools BuildRequires: python3-pbr Requires: python3-babel Requires: python3-pbr -Requires: python3-six >= 1.9.0 +Requires: python3-six Requires: python3-wrapt -%description -n python3-debtcollector +%description -n python3-%{pypi_name} It is a collection of functions/decorators which is used to signal a user when * a method (static method, class method, or regular instance method) or a class or function is going to be removed at some point in the future. @@ -85,29 +79,15 @@ It is a collection of functions/decorators which is used to signal a user when * further customizing the emitted messages %endif -%if 0%{?with_python3} -%package -n python3-debtcollector-doc -Summary: Documentation for the debtcollector module -%{?python_provide:%python_provide python3-%{pypi_name}-doc} - -BuildRequires: python3-sphinx -BuildRequires: python3-oslo-sphinx -BuildRequires: python3-six >= 1.9.0 -BuildRequires: dos2unix - -%description -n python3-debtcollector-doc -Documentation for the debtcollector module -%endif - - %prep -%setup -q -n %{pypi_name}-%{version} +%setup -q -n %{pypi_name}-%{upstream_version} # let RPM handle deps rm -rf requirements.txt %build -%{__python2} setup.py build +%py2_build + # doc export PYTHONPATH="$( pwd ):$PYTHONPATH" pushd doc @@ -117,77 +97,37 @@ popd rm -fr doc/build/html/.buildinfo %if 0%{?with_python3} -%{__python3} setup.py build -export PYTHONPATH="$( pwd ):$PYTHONPATH" -pushd doc -sphinx-build-3 -b html -d build/doctrees source build/html -popd -# Fix hidden-file-or-dir warnings -rm -fr doc/build/html/.buildinfo +%py3_build %endif %install -%{__python2} setup.py install -O1 --skip-build --root %{buildroot} -dos2unix doc/build/html/_static/jquery.js +%py2_install %if 0%{?with_python3} -%{__python3} setup.py install --skip-build --root %{buildroot} +%py3_install %endif -%files -n python2-debtcollector +%files -n python2-%{pypi_name} %doc README.rst CONTRIBUTING.rst %license LICENSE %{python2_sitelib}/%{pypi_name} %{python2_sitelib}/%{pypi_name}*.egg-info +%exclude %{python2_sitelib}/%{pypi_name}/tests -%files -n python2-debtcollector-doc +%files -n python-%{pypi_name}-doc %doc doc/build/html %license LICENSE %if 0%{?with_python3} -%files -n python3-debtcollector +%files -n python3-%{pypi_name} +%doc README.rst CONTRIBUTING.rst %license LICENSE %{python3_sitelib}/%{pypi_name} %{python3_sitelib}/%{pypi_name}*.egg-info -%endif - -%if 0%{?with_python3} -%files -n python3-debtcollector-doc -%doc doc/build/html -%license LICENSE +%exclude %{python2_sitelib}/%{pypi_name}/tests %endif %changelog -* Thu Feb 04 2016 Fedora Release Engineering - 0.8.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Tue Nov 10 2015 Fedora Release Engineering - 0.8.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5 - -* Fri Sep 18 2015 Alan Pevec 0.8.0-1 -- Update to upstream 0.8.0 - -* Mon Sep 07 2015 Chandan Kumar 0.7.0-3 -- Fixed obseletes -- Fixed package namespaces - -* Wed Sep 02 2015 Chandan Kumar 0.7.0-2 -- Added python 2 and python 3 subpackage - -* Wed Aug 05 2015 Alan Pevec 0.7.0-1 -- Update to upstream 0.7.0 - -* Sun Jun 28 2015 Alan Pevec 0.5.0-1 -- Update to upstream 0.5.0 - -* Thu Jun 18 2015 Fedora Release Engineering - 0.3.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Fri Mar 27 2015 Chandan Kumar - 0.3.0-3 -- Fixed jquery doc issues - -* Wed Mar 25 2015 Chandan Kumar - 0.3.0-2 -- Fixed doc and license macro in spec file +* Fri Mar 18 2016 Haikel Guemar 1.3.0- +- Update to 1.3.0 -* Tue Mar 10 2015 Chandan Kumar - 0.3.0-1 -- Initial Package diff --git a/sources b/sources index 72f4bec..c29073e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -654530b3b8f03121679046b3ee4b40c3 debtcollector-0.8.0.tar.gz +27b1e98d9c71f256fe03907f163c41bb debtcollector-1.3.0.tar.gz