.gitignore

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

.python-distro.metadata

@@ -1 +1 @@
-d72ac60844b2b472fc815441afe60fc1da728926 SOURCES/distro-1.4.0.tar.gz
+cb0e7d550a3c66c960a1914718e4f4dfe1228a19 SOURCES/distro-1.5.0.tar.gz

SPECS/python-distro.spec

@@ -1,13 +1,20 @@
 %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.4.0
+Version:        1.5.0
-Release:        2%{?dist}
+Release:        7%{?dist}
 Summary:        Linux Distribution - a Linux OS platform information API
 
 License:        ASL 2.0
 URL:            https://github.com/nir0s/distro
-Source0:        %{pypi_source}
+Source0:        https://files.pythonhosted.org/packages/source/%(n=%{pypi_name}; echo ${n:0:1})/%{pypi_name}/%{pypi_name}-%{version}.tar.gz
 BuildArch:      noarch
  
 %global _description \
@@ -26,55 +33,127 @@ 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}
-%if %{with python36_module}
+Suggests:       /usr/bin/lsb_release
-BuildRequires:  python36-devel
-BuildRequires:  python36-rpm-macros
-%else
-BuildRequires:  python3-devel
 %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
 
-
 %build
+%if %{with python2}
+%py2_build
+%endif
+%if %{with python3}
 %py3_build
-
+%endif
 
 %install
+%if %{with python2}
+%py2_install
+%endif
+%if %{with python3}
 %py3_install
+%endif
 
+%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
 
-%check
+%if %{with python3}
-%{__python3} -m pytest tests -v
-
-
 %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
+
 %{_bindir}/distro
 
+%check
+%if %{with python2}
+%{__python2} -m pytest tests -v
+%endif
+%if %{with python3}
+%{__python3} -m pytest tests -v
+%endif
 
 %changelog
-* Tue Jun 04 2019 Tomas Orsava <torsava@redhat.com> - 1.4.0-2
+* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 1.5.0-7
-- Port from Fedora to RHEL8, part of the python36 module
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-- Resolves: rhbz#1678920
+  Related: rhbz#1991688
+
+* 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
+
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.0-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Sat May 23 2020 Miro Hrončok <mhroncok@redhat.com> - 1.5.0-3
+- Rebuilt for Python 3.9
+
+* Mon May 11 2020 Stephen Gallagher <sgallagh@redhat.com> - 1.5.0-2
+- Fix Python configuration for ELN/RHEL 9
+- Rework bconds for Python now that there are no Fedoras left that should
+  use Python2
+
+* Tue Mar 31 2020 Marek Blaha <mblaha@redhat.com> - 1.5.0-1
+- rebase to distro 1.5.0
+
+* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.0-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 1.4.0-4
+- Rebuilt for Python 3.8.0rc1 (#1748018)
+
+* Fri Aug 16 2019 Miro Hrončok <mhroncok@redhat.com> - 1.4.0-3
+- Rebuilt for Python 3.8
+
+* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 
 * Mon Feb 04 2019 Marek Blaha <mblaha@redhat.com> - 1.4.0-1
 - rebase to distro 1.4.0