SPECS/python-iniconfig.spec

@@ -1,29 +1,18 @@
 Name:               python-iniconfig
 Version:            1.1.1
-Release:            2%{?dist}
+Release:            7%{?dist}
 Summary:            Brain-dead simple parsing of ini files
 License:            MIT
 URL:                http://github.com/RonnyPfannschmidt/iniconfig
-
 BuildArch:          noarch
-# Exclude i686 arch. Due to a modularity issue it's being added to the
+BuildRequires:      python3-devel
-# x86_64 compose of CRB, but we don't want to ship it at all.
+BuildRequires:      pyproject-rpm-macros
-# See: https://projects.engineering.redhat.com/browse/RCM-72605
-ExcludeArch:        i686
-
-BuildRequires:      python%{python3_pkgversion}-devel
-BuildRequires:      python%{python3_pkgversion}-rpm-macros
-BuildRequires:      python%{python3_pkgversion}-setuptools
-BuildRequires:      python%{python3_pkgversion}-wheel
 
 Source0:            %{pypi_source iniconfig}
 
-# pytest 6+ needs this and this uses pytest for tests
+# Tests are disabled to remove the test dependencies
-%bcond_without tests
+# Specify --with tests to run the tests on e.g. EPEL
-
+%bcond_with tests
-%if %{with tests}
-BuildRequires:      python%{python3_pkgversion}-pytest
-%endif
 
 %global _description %{expand:
 iniconfig is a small and simple INI-file parser module
@@ -39,45 +28,61 @@ having a unique set of features:
 %description %_description
 
 
-%package -n python%{python3_pkgversion}-iniconfig
+%package -n python3-iniconfig
 Summary:            %{summary}
-%description -n python%{python3_pkgversion}-iniconfig %_description
+%description -n python3-iniconfig %_description
 
 
 %prep
 %autosetup -n iniconfig-%{version}
 
-# Remove dependency of setuptools-scm
+
-sed -i "s/ *use_scm_version=.*,/version='%{version}',/" setup.py
+%generate_buildrequires
+%pyproject_buildrequires %{?with_tests:-t}
 
 
 %build
-%py3_build
+%pyproject_wheel
 
 
 %install
-%py3_install
+%pyproject_install
+%pyproject_save_files iniconfig
 
 
 %if %{with tests}
 %check
-%pytest
+%tox
 %endif
 
 
-%files -n python%{python3_pkgversion}-iniconfig
+%files -n python3-iniconfig -f %{pyproject_files}
 %doc README.txt
 %license LICENSE
-%{python3_sitelib}/iniconfig-%{version}-py%{python3_version}.egg-info/
-%{python3_sitelib}/iniconfig/
 
 
 %changelog
-* Wed Jan 13 2021 Tomas Orsava <torsava@redhat.com> - 1.1.1-2
+* Tue Feb 22 2022 Tomas Orsava <torsava@redhat.com> - 1.1.1-7
-- Convert from Fedora to the python39 module in RHEL8
+- Add gating configuration and a simple smoke test
-- Revert usage of pyproject-rpm-macros
+- Related: rhbz#1950291
-- Remove dependency on setuptools_scm
+
-- Resolves: rhbz#1877430
+* Tue Feb 08 2022 Tomas Orsava <torsava@redhat.com> - 1.1.1-6
+- Add automatically generated Obsoletes tag with the python39- prefix
+  for smoother upgrade from RHEL8
+- Related: rhbz#1990421
+
+* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 1.1.1-5
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688
+
+* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.1.1-4
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+
+* Mon Mar 08 2021 Charalampos Stratakis <cstratak@redhat.com> - 1.1.1-3
+- Disable tests on RHEL9 to remove tox dependency
+
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
 
 * Thu Oct 15 2020 Tomas Hrnciar <thrnciar@redhat.com> - 1.1.1-1
 - Update to 1.1.1 (#1888157)