diff --git a/progressbar-2.3+hg20121105.3c94a3a1ebe1.tar.bz2 b/progressbar-2.3+hg20121105.3c94a3a1ebe1.tar.bz2 deleted file mode 100644 index 586ab2d..0000000 --- a/progressbar-2.3+hg20121105.3c94a3a1ebe1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e00a486344b19152ff3e1986c54c9cf5e45b2852e1c5db96982a330cd4a3cbe1 -size 9884 diff --git a/progressbar-2.5.tar.gz b/progressbar-2.5.tar.gz new file mode 100644 index 0000000..4a0d4b5 --- /dev/null +++ b/progressbar-2.5.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5d81cb529da2e223b53962afd6c8ca0f05c6670e40309a7219eacc36af9b6c63 +size 10046 diff --git a/progressbar-python3-relative-imports.patch b/progressbar-python3-relative-imports.patch deleted file mode 100644 index c6a6601..0000000 --- a/progressbar-python3-relative-imports.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -ruN a/progressbar/__init__.py b/progressbar/__init__.py ---- a/progressbar/__init__.py 2012-11-05 23:03:46.693882987 +0100 -+++ b/progressbar/__init__.py 2012-11-05 23:17:29.704908198 +0100 -@@ -44,6 +44,6 @@ - __date__ = '2011-05-14' - __version__ = '2.3' - --from compat import * --from widgets import * --from progressbar import * -+from .compat import * -+from .widgets import * -+from .progressbar import * -Binärdateien a/progressbar/.__init__.py.swp and b/progressbar/.__init__.py.swp sind verschieden. -diff -ruN a/progressbar/progressbar.py b/progressbar/progressbar.py ---- a/progressbar/progressbar.py 2012-11-05 23:03:46.696882987 +0100 -+++ b/progressbar/progressbar.py 2012-11-05 23:18:44.677910496 +0100 -@@ -35,7 +35,7 @@ - except ImportError: - pass - --import widgets -+from . import widgets - - - class UnknownLength: pass -Binärdateien a/progressbar/.progressbar.py.swp and b/progressbar/.progressbar.py.swp sind verschieden. diff --git a/python-progressbar.changes b/python-progressbar.changes index ae99ce1..911204c 100644 --- a/python-progressbar.changes +++ b/python-progressbar.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Thu Oct 11 15:18:59 UTC 2018 - Todd R + +- Update to version 2.5 + * fix issue with recursive import and mixed tabs with spaces + * Add support for python3.6 + * Don't use `sys.stderr` as a default value +- Drop progressbar-python3-relative-imports.patch + It is included upstream + ------------------------------------------------------------------- Thu Aug 31 17:13:34 UTC 2017 - toddrme2178@gmail.com diff --git a/python-progressbar.spec b/python-progressbar.spec index 16df311..e3d4b4a 100644 --- a/python-progressbar.spec +++ b/python-progressbar.spec @@ -1,7 +1,7 @@ # # spec file for package python-progressbar # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,15 +18,13 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-progressbar -Version: 2.3+hg20121105.3c94a3a1ebe1 -%define eggver 2.3 +Version: 2.5 Release: 0 Summary: Text Progressbar Library for Python -License: LGPL-2.1+ or BSD-3-Clause +License: LGPL-2.1+ OR BSD-3-Clause Group: Development/Libraries/Python Url: https://github.com/niltonvolpato/python-progressbar -Source: progressbar-%{version}.tar.bz2 -Patch0: progressbar-python3-relative-imports.patch +Source: https://files.pythonhosted.org/packages/source/p/progressbar/progressbar-%{version}.tar.gz BuildRequires: %{python_module devel} BuildRequires: %{python_module setuptools} BuildRequires: python-rpm-macros @@ -40,9 +38,7 @@ display the progress of a long running operation, providing a visual clue that processing is underway. %prep -%setup -q -n progressbar -%patch0 -p1 -sed -i "/\/usr\/bin\/python/d" progressbar/*.py # Correctly fix non-executable-script warning +%setup -q -n progressbar-%{version} %build %python_build @@ -51,9 +47,9 @@ sed -i "/\/usr\/bin\/python/d" progressbar/*.py # Correctly fix non-executable- %python_install %files %{python_files} -%defattr(-,root,root) -%doc LICENSE.txt README.txt examples.py +%doc README.txt examples.py +%license LICENSE.txt %{python_sitelib}/progressbar/ -%{python_sitelib}/progressbar-%{eggver}-py*.egg-info +%{python_sitelib}/progressbar-%{version}-py*.egg-info %changelog