.gitignore

@@ -1 +1 @@
-SOURCES/distro-1.5.0.tar.gz
+SOURCES/distro-1.9.0.tar.gz

.python-distro.metadata

@@ -1 +1 @@
-cb0e7d550a3c66c960a1914718e4f4dfe1228a19 SOURCES/distro-1.5.0.tar.gz
+4e794ca46bad11a0e7d8cd3e89c10b01f706207f SOURCES/distro-1.9.0.tar.gz

SPECS/python-distro.spec

@@ -1,21 +1,16 @@
 %global pypi_name distro
-%if 0%{?rhel} && 0%{?rhel} <= 7
-%bcond_with python3
-%bcond_without python2
-%else
-%bcond_without python3
-%bcond_with python2
-%endif
 
 Name:           python-%{pypi_name}
-Version:        1.5.0
-Release:        7%{?dist}
+Version:        1.9.0
+Release:        5%{?dist}
 Summary:        Linux Distribution - a Linux OS platform information API
 
-License:        ASL 2.0
-URL:            https://github.com/nir0s/distro
-Source0:        https://files.pythonhosted.org/packages/source/%(n=%{pypi_name}; echo ${n:0:1})/%{pypi_name}/%{pypi_name}-%{version}.tar.gz
+License:        Apache-2.0
+URL:            https://github.com/python-distro/distro
+Source0:        %{url}/archive/v%{version}/%{pypi_name}-%{version}.tar.gz
 BuildArch:      noarch
+BuildRequires:  python3-devel
+BuildRequires:  python3-pytest
  
 %global _description \
 The distro (for: Linux Distribution) package provides information about the\
@@ -33,98 +28,108 @@ for more information.
 
 %description %{_description}
 
-%if %{with python2}
-%package -n     python2-%{pypi_name}
-Summary:        %{summary}
-%{?python_provide:%python_provide python2-%{pypi_name}}
-BuildRequires:  python2-devel
-%if 0%{?rhel} && 0%{?rhel} <= 7
-BuildRequires:  python-setuptools
-BuildRequires:  pytest
-%else
-BuildRequires:  python2-setuptools
-BuildRequires:  python2-pytest
-%endif
-%if 0%{?fedora}
-Suggests:       /usr/bin/lsb_release
-%endif
-
-%description -n python2-%{pypi_name} %{_description}
-
-Python 2 version.
-%endif
-
-%if %{with python3}
 %package -n     python3-%{pypi_name}
 Summary:        %{summary}
-%{?python_provide:%python_provide python3-%{pypi_name}}
-BuildRequires:  python3-devel
-BuildRequires:  python3-setuptools
-BuildRequires:  python3-pytest
 %if 0%{?fedora}
 Suggests:       /usr/bin/lsb_release
 %endif
 
 %description -n python3-%{pypi_name} %{_description}
 
-Python 3 version.
-%endif
-
 %prep
 %autosetup -n %{pypi_name}-%{version}
-# Remove bundled egg-info
-rm -rf %{pypi_name}.egg-info
+
+%generate_buildrequires
+%pyproject_buildrequires
 
 %build
-%if %{with python2}
-%py2_build
-%endif
-%if %{with python3}
-%py3_build
-%endif
+%pyproject_wheel
 
 %install
-%if %{with python2}
-%py2_install
-%endif
-%if %{with python3}
-%py3_install
-%endif
+%pyproject_install
 
-%if %{with python2}
-%files -n python2-%{pypi_name}
-%doc CHANGELOG.md CONTRIBUTORS.md README.md
-%license LICENSE
-%{python2_sitelib}/%{pypi_name}-*.egg-info/
-%{python2_sitelib}/%{pypi_name}.py*
-%endif
-
-%if %{with python3}
 %files -n python3-%{pypi_name}
 %doc CHANGELOG.md CONTRIBUTORS.md README.md
 %license LICENSE
-%{python3_sitelib}/%{pypi_name}-*.egg-info/
-%{python3_sitelib}/%{pypi_name}.py
-%{python3_sitelib}/__pycache__/%{pypi_name}.*
-%endif
+%{python3_sitelib}/%{pypi_name}/
+%{python3_sitelib}/%{pypi_name}-%{version}.dist-info/
 
 %{_bindir}/distro
 
 %check
-%if %{with python2}
-%{__python2} -m pytest tests -v
-%endif
-%if %{with python3}
-%{__python3} -m pytest tests -v
-%endif
+%pytest
 
 %changelog
-* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 1.5.0-7
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
+* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 1.9.0-5
+- Bump release for October 2024 mass rebuild:
+  Resolves: RHEL-64018
+
+* Fri Oct 25 2024 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 1.9.0-4
+- Rebuilt for MSVSphere 10
+
+* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 1.9.0-4
+- Bump release for June 2024 mass rebuild
+
+* Fri Jan 26 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sun Dec 24 2023 Packit <hello@packit.dev> - 1.9.0-1
+- Optimize some repo metastuff and prepare v1.9.0 (#364) (nir0s)
+- Actions(deps): Bump actions/setup-python from 4 to 5 (#363) (dependabot[bot])
+- Test on modern versions of CPython and PyPy and macOS (#362) (Christian Clauss)
+- Actions(deps): Bump actions/checkout from 3 to 4 (#361) (dependabot[bot])
+- Refactor `distro.info()` method to return an `InfoDict` (#360) (SCC/楊志璿)
+- Ignore the file '/etc/ec2_version' (Pritam Kulkarni)
+- Add Debian Testing to the tests (#356) (Harshula Jayasuriya)
+- Ignore the file '/etc/board-release' (#353) (Pedro Lamas)
+- Add support for ALT Linux Server 10.1 distribution (#354) (Alexander Stepchenko)
+- Run Python 3.6 on Ubuntu 20.04 for CI and bump isort (#355) (Samuel FORESTIER)
+- Update archlinux resource for tests (Saltaformajo)
+- Resolves rhbz#2255740
+
+* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Tue Jun 13 2023 Python Maint <python-maint@redhat.com> - 1.8.0-5
+- Rebuilt for Python 3.12
+
+* Tue May 23 2023 Yaakov Selkowitz <yselkowi@redhat.com> - 1.8.0-4
+- Migrate from tox to pytest
+
+* Sat Feb 11 2023 msuchy <msuchy@redhat.com> - 1.8.0-3
+- migrate license to SPDX
+
+* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Fri Oct 14 2022 Marek Blaha <mblaha@redhat.com> - 1.8.0-1
+- Update to 1.8.0
+
+* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 1.7.0-2
+- Rebuilt for Python 3.11
+
+* Wed Feb 16 2022 Marek Blaha <mblaha@redhat.com> - 1.7.0-1
+- Update to 1.7.0 (#2054810)
+- Drop Python 2 support in the spec
+- Run tests using tox
+
+* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Thu Aug 05 2021 Marek Blaha <mblaha@redhat.com> - 1.6.0-1
+- Update to 1.6.0 (#1988492)
+
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.0-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.5.0-6
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+* Thu Jun 03 2021 Python Maint <python-maint@redhat.com> - 1.5.0-6
+- Rebuilt for Python 3.10
 
 * Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild