update to 1.4
Sync el6 with the rest of the branches. Version: 1.4-2
This commit is contained in:
Pavel Raiskup
parent
7a93173549
commit
8726ae0064
6 changed files with 215 additions and 202 deletions
|
|
@ -1,39 +1,68 @@
|
|||
%if 0%{?fedora}
|
||||
%bcond_without python3
|
||||
%if 0%{?fedora} > 29
|
||||
%bcond_with python2
|
||||
%else
|
||||
%bcond_without python2
|
||||
%endif
|
||||
%else
|
||||
%if 0%{?rhel} > 7
|
||||
%bcond_with python2
|
||||
%bcond_without python3
|
||||
%else
|
||||
%bcond_without python2
|
||||
%bcond_with python3
|
||||
%endif
|
||||
%endif
|
||||
|
||||
# Created by pyp2rpm-0.5.2
|
||||
%global pypi_name progress
|
||||
%global with_python3 0%{?fedora}
|
||||
|
||||
Name: python-%{pypi_name}
|
||||
Version: 1.2
|
||||
Release: 10%{?dist}
|
||||
Version: 1.4
|
||||
Release: 2%{?dist}
|
||||
Summary: Easy to use progress bars
|
||||
|
||||
License: ISC
|
||||
URL: http://github.com/verigak/progress/
|
||||
Source0: https://pypi.python.org/packages/source/p/%{pypi_name}/%{pypi_name}-%{version}.tar.gz
|
||||
Source0: %pypi_source
|
||||
BuildArch: noarch
|
||||
|
||||
|
||||
%if %{with python2}
|
||||
BuildRequires: python2-devel
|
||||
BuildRequires: python-setuptools
|
||||
|
||||
%if %{?with_python3}
|
||||
BuildRequires: python2-setuptools
|
||||
%endif
|
||||
|
||||
%if %{with python3}
|
||||
BuildRequires: python3-devel
|
||||
BuildRequires: python3-setuptools
|
||||
%endif # if with_python3
|
||||
%endif
|
||||
|
||||
Patch1: 0001-possibly-enlarge-dequeue-to-give-us-better-statistic.patch
|
||||
Patch2: 0002-make-the-progress-bar-more-stable.patch
|
||||
Patch1: 0001-fixup-moving-average-window.patch
|
||||
|
||||
%description
|
||||
Collection of easy to use progress bars and spinners.
|
||||
%global _description\
|
||||
Collection of easy to use progress bars and spinners.\
|
||||
|
||||
|
||||
%if 0%{?with_python3}
|
||||
%description %_description
|
||||
|
||||
|
||||
%if 0%{with python2}
|
||||
%package -n python2-%{pypi_name}
|
||||
Summary: %summary
|
||||
%{?python_provide:%python_provide python2-%{pypi_name}}
|
||||
|
||||
%description -n python2-%{pypi_name} %_description
|
||||
%endif # python2
|
||||
|
||||
|
||||
%if 0%{with python3}
|
||||
%package -n python3-%{pypi_name}
|
||||
Summary: Easy to use progress bars
|
||||
|
||||
%description -n python3-%{pypi_name}
|
||||
Collection of easy to use progress bars and spinners.
|
||||
%endif # with_python3
|
||||
%endif # python3
|
||||
|
||||
|
||||
%prep
|
||||
|
|
@ -42,48 +71,68 @@ Collection of easy to use progress bars and spinners.
|
|||
# Remove bundled egg-info
|
||||
rm -rf %{pypi_name}.egg-info
|
||||
|
||||
%if 0%{?with_python3}
|
||||
rm -rf %{py3dir}
|
||||
cp -a . %{py3dir}
|
||||
find %{py3dir} -name '*.py' | xargs sed -i '1s|^#!python|#!%{__python3}|'
|
||||
%endif # with_python3
|
||||
|
||||
%build
|
||||
%{__python2} setup.py build
|
||||
%{?with_python2: %py2_build}
|
||||
%{?with_python3: %py3_build}
|
||||
|
||||
%if 0%{?with_python3}
|
||||
pushd %{py3dir}
|
||||
%{__python3} setup.py build
|
||||
popd
|
||||
%endif # with_python3
|
||||
|
||||
%install
|
||||
# Must do the subpackages' install first because the scripts in /usr/bin are
|
||||
# overwritten with every setup.py install (and we want the python2 version
|
||||
# to be the default for now).
|
||||
%if 0%{?with_python3}
|
||||
pushd %{py3dir}
|
||||
%{__python3} setup.py install --skip-build --root %{buildroot}
|
||||
popd
|
||||
%endif # with_python3
|
||||
%{?with_python2: %py2_install}
|
||||
%{?with_python3: %py3_install}
|
||||
|
||||
%{__python2} setup.py install --skip-build --root %{buildroot}
|
||||
|
||||
%files
|
||||
%if 0%{with python2}
|
||||
%files -n python2-%{pypi_name}
|
||||
%doc README.rst LICENSE
|
||||
%{python2_sitelib}/%{pypi_name}
|
||||
%{python2_sitelib}/%{pypi_name}-%{version}-py?.?.egg-info
|
||||
%endif
|
||||
|
||||
%if 0%{?with_python3}
|
||||
%if 0%{with python3}
|
||||
%files -n python3-%{pypi_name}
|
||||
%doc README.rst LICENSE
|
||||
%{python3_sitelib}/%{pypi_name}
|
||||
%{python3_sitelib}/%{pypi_name}-%{version}-py?.?.egg-info
|
||||
%endif # with_python3
|
||||
%endif
|
||||
|
||||
|
||||
%changelog
|
||||
* Sat Sep 01 2018 Pavel Raiskup <praiskup@redhat.com> - 1.2-10
|
||||
- el6 build requires newline after %%autosetup (rhbz#1310704)
|
||||
* Tue Dec 11 2018 Pavel Raiskup <praiskup@redhat.com> - 1.4-2
|
||||
- followup for previous commit, PR#3
|
||||
|
||||
* Wed Dec 05 2018 Gwyn Ciesla <limburgher@gmail.com> - 1.4-1
|
||||
- 1.4
|
||||
|
||||
* Wed Oct 03 2018 Pavel Raiskup <praiskup@redhat.com> - 1.2-19
|
||||
- no python2 in f30+ (rhbz#1634951)
|
||||
- fix el6 build (rhbz#1310704)
|
||||
|
||||
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.2-18
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
* Tue Jun 19 2018 Miro Hrončok <mhroncok@redhat.com> - 1.2-17
|
||||
- Rebuilt for Python 3.7
|
||||
|
||||
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.2-16
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||
|
||||
* Sat Jan 27 2018 Iryna Shcherbina <ishcherb@redhat.com> - 1.2-15
|
||||
- Update Python 2 dependency declarations to new packaging standards
|
||||
(See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)
|
||||
|
||||
* Sat Aug 19 2017 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 1.2-14
|
||||
- Python 2 binary package renamed to python2-progress
|
||||
See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3
|
||||
|
||||
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.2-13
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
||||
|
||||
* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.2-12
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
||||
|
||||
* Mon Dec 19 2016 Miro Hrončok <mhroncok@redhat.com> - 1.2-11
|
||||
- Rebuild for Python 3.6
|
||||
|
||||
* Thu Dec 08 2016 Pavel Raiskup <praiskup@redhat.com> - 1.2-10
|
||||
- keep enabled python3 subpackage only in fedora, and merge into epel7
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue