diff --git a/progressbar-2.3+hg20121105.3c94a3a1ebe1.tar.bz2 b/progressbar-2.3+hg20121105.3c94a3a1ebe1.tar.bz2 new file mode 100644 index 0000000..586ab2d --- /dev/null +++ b/progressbar-2.3+hg20121105.3c94a3a1ebe1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e00a486344b19152ff3e1986c54c9cf5e45b2852e1c5db96982a330cd4a3cbe1 +size 9884 diff --git a/progressbar-2.3.tar.gz b/progressbar-2.3.tar.gz deleted file mode 100644 index b3d205f..0000000 --- a/progressbar-2.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:00a316c1a99b70a803d7430fd088da24f37dbfb64f81c4772b97fbc1e8031de4 -size 9802 diff --git a/progressbar-python3-relative-imports.patch b/progressbar-python3-relative-imports.patch new file mode 100644 index 0000000..41f0aac --- /dev/null +++ b/progressbar-python3-relative-imports.patch @@ -0,0 +1,27 @@ +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 progressbar.compat import * ++from progressbar.widgets import * ++from progressbar.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 progressbar 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 3856147..86db537 100644 --- a/python-progressbar.changes +++ b/python-progressbar.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Nov 5 22:20:32 UTC 2012 - saschpe@suse.de + +- Update to 2.3+hg20121105.3c94a3a1ebe1 + + See mercurial changes + ------------------------------------------------------------------- Wed May 23 02:44:33 UTC 2012 - highwaystar.ru@gmail.com diff --git a/python-progressbar.spec b/python-progressbar.spec index 2f2b87a..739a0b2 100644 --- a/python-progressbar.spec +++ b/python-progressbar.spec @@ -1,7 +1,7 @@ # # spec file for package python-progressbar # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -11,23 +11,24 @@ # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -%define modname progressbar -Name: python-%{modname} -Version: 2.3 + + +Name: python-progressbar +Version: 2.3+hg20121105.3c94a3a1ebe1 Release: 0 -License: LGPL-2.1+ or BSD-3-Clause Summary: Text Progressbar Library for Python -Url: http://code.google.com/p/python-%{modname}/ +License: LGPL-2.1+ or BSD-3-Clause Group: Development/Libraries/Python -Source: http://python-progressbar.googlecode.com/files/%{modname}-%{version}.tar.gz +Url: http://code.google.com/p/python-progressbar/ +Source: progressbar-%{version}.tar.bz2 BuildRequires: python-devel BuildRequires: python-distribute BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} && 0%{?suse_version} <= 1110 -%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} +%{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %else BuildArch: noarch %endif @@ -38,7 +39,8 @@ display the progress of a long running operation, providing a visual clue that processing is underway. %prep -%setup -q -n %{modname}-%{version} +%setup -q -n progressbar +sed -i "/\/usr\/bin\/python/d" progressbar/*.py # Correctly fix non-executable-script warning %build python setup.py build @@ -49,7 +51,7 @@ python setup.py install --prefix="%{_prefix}" --root=%{buildroot} %files %defattr(-,root,root) %doc LICENSE.txt README.txt examples.py -%{python_sitelib}/%{modname}/ -%{python_sitelib}/%{modname}-%{version}-py%{py_ver}.egg-info +%{python_sitelib}/progressbar/ +%{python_sitelib}/progressbar-2.3-py%{py_ver}.egg-info %changelog diff --git a/python3-progressbar.changes b/python3-progressbar.changes index d97380e..25b68f6 100644 --- a/python3-progressbar.changes +++ b/python3-progressbar.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Mon Nov 5 22:38:46 UTC 2012 - saschpe@suse.de + +- Correctly fix non-executable-script rpmlint warning +- No need to explicitly require python(abi), RPM does that since ages +- Cleanup old SUSE version checks + +------------------------------------------------------------------- +Mon Nov 5 22:21:08 UTC 2012 - saschpe@suse.de + +- Update to 2.3+hg20121105.3c94a3a1ebe1 + + See mercurial changes +- Add progressbar-python3-relative-imports.patch: Fix import paths + ------------------------------------------------------------------- Thu Sep 6 13:05:51 UTC 2012 - toddrme2178@gmail.com diff --git a/python3-progressbar.spec b/python3-progressbar.spec index ca87db2..69afda8 100644 --- a/python3-progressbar.spec +++ b/python3-progressbar.spec @@ -11,31 +11,25 @@ # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -%define modname progressbar -Name: python3-%{modname} -Version: 2.3 + +Name: python3-progressbar +Version: 2.3+hg20121105.3c94a3a1ebe1 Release: 0 -License: LGPL-2.1+ or BSD-3-Clause Summary: Text Progressbar Library for Python -Url: http://code.google.com/p/python-%{modname}/ +License: LGPL-2.1+ or BSD-3-Clause Group: Development/Libraries/Python -Source: http://python-progressbar.googlecode.com/files/%{modname}-%{version}.tar.gz +Url: http://code.google.com/p/python-progressbar/ +Source: progressbar-%{version}.tar.bz2 +Patch0: progressbar-python3-relative-imports.patch BuildRequires: python3 BuildRequires: python3-devel BuildRequires: python3-distribute BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if 0%{?suse_version} <= 1140 -%{!?python3_sitelib: %global python3_sitelib %(python3 -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} -%{!?py3_ver: %global py3_ver %(python3 -c "import sys; version=str(sys.version_info[0]) + '.' + str(sys.version_info[1]); print(version)" 2>/dev/null || echo PYTHON-NOT-FOUND)} -%else -BuildRequires: python3-base -%endif -Requires: python(abi) = %{py3_ver} -BuildArch: noarch +BuildArch: noarch %description This library provides a text mode progressbar. This is tipically used to @@ -43,22 +37,20 @@ display the progress of a long running operation, providing a visual clue that processing is underway. %prep -%setup -q -n %{modname}-%{version} +%setup -q -n progressbar +%patch0 -p1 +sed -i "/\/usr\/bin\/python/d" progressbar/*.py # Correctly fix non-executable-script warning %build python3 setup.py build %install -python3 setup.py install --prefix="%{_prefix}" --root=%{buildroot} -chmod +x %{buildroot}%{python3_sitelib}/progressbar/*.py +python3 setup.py install --prefix=%{_prefix} --root=%{buildroot} %files %defattr(-,root,root) %doc LICENSE.txt README.txt examples.py -%{python3_sitelib}/%{modname}/ -%{python3_sitelib}/%{modname}-%{version}-py%{py3_ver}.egg-info -%if 0%{?suse_version} <= 1140 -%dir %{_prefix}/lib/python%{py3_ver} -%endif +%{python3_sitelib}/progressbar/ +%{python3_sitelib}/progressbar-2.3-py%{py3_ver}.egg-info %changelog