diff --git a/README.md b/README.md deleted file mode 100644 index 9d9b529..0000000 --- a/README.md +++ /dev/null @@ -1 +0,0 @@ -See also automatic push/pr [Copr builds](https://copr.fedorainfracloud.org/coprs/praiskup/enterprise-ci-python-progress/). diff --git a/build-and-update-all-branches b/build-and-update-all-branches index e52a0d7..53768c2 100755 --- a/build-and-update-all-branches +++ b/build-and-update-all-branches @@ -3,7 +3,7 @@ # Prepare main branch, review the list of branches below and then execute this # script. -branches='main epel8 epel9 epel10 f39 f40 f41' +branches='main epel7 epel8 epel9 f35 f36' exit_handler () { diff --git a/python-progress.spec b/python-progress.spec index d8c3ee7..8532c35 100644 --- a/python-progress.spec +++ b/python-progress.spec @@ -1,98 +1,103 @@ +%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 Name: python-%{pypi_name} Version: 1.6 -Release: 19%{?dist} +Release: 13%{?dist} Summary: Easy to use progress bars License: ISC URL: http://github.com/verigak/progress/ -Source0: %{pypi_source %{pypi_name}} +Source0: %pypi_source BuildArch: noarch +%if %{with python2} +BuildRequires: python2-devel +BuildRequires: python2-setuptools +%endif + +%if %{with python3} BuildRequires: python3-devel -%if %{defined el8} BuildRequires: python3-setuptools %endif Patch1: 0001-fixup-moving-average-window.patch -%global _description %{expand: -Collection of easy to use progress bars and spinners.} +%global _description\ +Collection of easy to use progress bars and spinners.\ %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 + + +%if 0%{with python3} %package -n python3-%{pypi_name} Summary: Easy to use progress bars -%description -n python3-%{pypi_name} %_description +%description -n python3-%{pypi_name} +Collection of easy to use progress bars and spinners. +%endif %prep %autosetup -p1 -n %{pypi_name}-%{version} - -%if %{undefined el8} -%generate_buildrequires -%pyproject_buildrequires -%endif +# Remove bundled egg-info +rm -rf %{pypi_name}.egg-info %build -%if %{defined el8} -%py3_build -%else -%pyproject_wheel -%endif +%{?with_python2: %py2_build} +%{?with_python3: %py3_build} %install -%if %{defined el8} -%py3_install -%else -%pyproject_install -%pyproject_save_files -l %{pypi_name} +%{?with_python2: %py2_install} +%{?with_python3: %py3_install} + + +%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 - -%check -%if %{defined el8} -%py3_check_import %{pypi_name} -%else -%pyproject_check_import -%endif - - -%files -n python3-%{pypi_name} %{!?el8:-f %{pyproject_files}} -%doc README.rst -%if %{defined el8} -%license LICENSE +%if 0%{with python3} +%files -n python3-%{pypi_name} +%doc README.rst LICENSE %{python3_sitelib}/%{pypi_name} %{python3_sitelib}/%{pypi_name}-%{version}-py%{python3_version}.egg-info %endif %changelog -* Fri Sep 19 2025 Python Maint - 1.6-19 -- Rebuilt for Python 3.14.0rc3 bytecode - -* Fri Aug 15 2025 Python Maint - 1.6-18 -- Rebuilt for Python 3.14.0rc2 bytecode - -* Fri Jul 25 2025 Fedora Release Engineering - 1.6-17 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Mon Jun 02 2025 Python Maint - 1.6-16 -- Rebuilt for Python 3.14 - -* Sat Jan 18 2025 Fedora Release Engineering - 1.6-15 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Tue Sep 24 2024 Carl George - 1.6-14 -- Convert to pyproject macros - * Fri Jul 19 2024 Fedora Release Engineering - 1.6-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild @@ -114,7 +119,7 @@ Summary: Easy to use progress bars * Fri Jan 20 2023 Fedora Release Engineering - 1.6-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild -* Fri Jul 22 2022 Pavel Raiskup - 1.6-6 +* Fri Jul 15 2022 Pavel Raiskup - 1.6-6 - use time.monotonic(), bar.avg is infinity for zero speed * Fri Jul 22 2022 Fedora Release Engineering - 1.6-5