diff --git a/python-progress.spec b/python-progress.spec index 68e07cd..9383ca3 100644 --- a/python-progress.spec +++ b/python-progress.spec @@ -1,103 +1,83 @@ -%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: 13%{?dist} +Release: 14%{?dist} Summary: Easy to use progress bars License: ISC URL: http://github.com/verigak/progress/ -Source0: %pypi_source +Source0: %{pypi_source %{pypi_name}} 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\ -Collection of easy to use progress bars and spinners.\ +%global _description %{expand: +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} -Collection of easy to use progress bars and spinners. -%endif +%description -n python3-%{pypi_name} %_description %prep %autosetup -p1 -n %{pypi_name}-%{version} -# Remove bundled egg-info -rm -rf %{pypi_name}.egg-info + +%if %{undefined el8} +%generate_buildrequires +%pyproject_buildrequires +%endif %build -%{?with_python2: %py2_build} -%{?with_python3: %py3_build} +%if %{defined el8} +%py3_build +%else +%pyproject_wheel +%endif %install -%{?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 +%if %{defined el8} +%py3_install +%else +%pyproject_install +%pyproject_save_files -l %{pypi_name} %endif -%if 0%{with python3} -%files -n python3-%{pypi_name} -%doc README.rst LICENSE + +%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 %{python3_sitelib}/%{pypi_name} %{python3_sitelib}/%{pypi_name}-%{version}-py%{python3_version}.egg-info %endif %changelog +* 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