[rpms/python-vcstool] rawhide: Fix F45FTBFS

[rpms/python-vcstool] rawhide: Fix F45FTBFS

[Filipe Rosset]

A new commit has been pushed.

Repo   : rpms/python-vcstool
Branch : rawhide
Commit : 2d43f747d97356f9791a9096017997c47802cde9
Author : Filipe Rosset <rosset.filipe@gmail.com>
Date   : 2026-07-21T01:16:05-03:00
Stats  : +24/-49 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/python-vcstool/c/2d43f747d97356f9791a9096017997c47802cde9?branch=rawhide

Log:
Fix F45FTBFS

---
diff --git a/python-vcstool.rpmlintrc b/python-vcstool.rpmlintrc
index 76ccbc2..6cfccfe 100644
--- a/python-vcstool.rpmlintrc
+++ b/python-vcstool.rpmlintrc
@@ -1 +1,3 @@
 addFilter(r'no-manual-page-for-binary (vcs|vcs-.*)( |$)')
+addFilter(r'spelling-error')
+

diff --git a/python-vcstool.spec b/python-vcstool.spec
index dfba16f..2ef52e8 100644
--- a/python-vcstool.spec
+++ b/python-vcstool.spec
@@ -12,6 +12,12 @@ Source0:        https://github.com/dirk-thomas/%{srcname}/archive/%{version}/%{s
 
 BuildArch:      noarch
 
+BuildRequires:  git
+BuildRequires:  python3-devel
+BuildRequires:  python3-pkg_resources
+BuildRequires:  python3-pytest
+BuildRequires:  python3-setuptools
+
 %description
 Vcstool is a version control system (VCS) tool, designed to make working with
 multiple repositories easier.
@@ -28,25 +34,12 @@ The biggest differences between the two are:
   command line tools built on top.
 
 
-%package -n python%{python3_pkgversion}-%{srcname}
+%package -n python3-%{srcname}
 Summary:        %{summary}
-BuildRequires:  git
-BuildRequires:  python%{python3_pkgversion}-devel
-BuildRequires:  python%{python3_pkgversion}-pytest
-BuildRequires:  python%{python3_pkgversion}-PyYAML
-BuildRequires:  python%{python3_pkgversion}-setuptools
-%{?python_provide:%python_provide python%{python3_pkgversion}-%{srcname}}
-
-%if %{undefined __pythondist_requires}
-Requires:       python%{python3_pkgversion}-PyYAML
-Requires:       python%{python3_pkgversion}-setuptools
-%endif
-
-%if !0%{?rhel} || 0%{?rhel} >= 8
+
 Recommends:     git
-%endif
 
-%description -n python%{python3_pkgversion}-%{srcname}
+%description -n python3-%{srcname}
 Vcstool is a version control system (VCS) tool, designed to make working with
 multiple repositories easier.
 
@@ -66,57 +59,37 @@ The biggest differences between the two are:
 %autosetup -p1 -n %{srcname}-%{version}
 
 
-%build
-%py3_build
+%generate_buildrequires
+%pyproject_buildrequires -r
 
 
-%install
-# There are three extra things we're doing here:
-# 1. Making each executable available with a -X and -X.Y suffix
-# 2. Giving each python version a directory of executables for %%check
-# 3. Integrating with the bash-completion package
-
-install -d %{buildroot}%{_datadir}/bash-completion/completions %{buildroot}%{_bindir}
+%build
+%pyproject_wheel
 
-%py3_install -- --install-scripts %{_bindir}%{python3_pkgversion}
 
-echo -n "" > py3_bins
-for f in `ls %{buildroot}%{_bindir}%{python3_pkgversion}`; do
-  mv %{buildroot}%{_bindir}%{python3_pkgversion}/$f %{buildroot}%{_bindir}/$f-%{python3_version}
-  ln -s $f-%{python3_version} %{buildroot}%{_bindir}/$f-3
-  ln -s $f-%{python3_version} %{buildroot}%{_bindir}/$f
-  echo -e "%{_bindir}/$f\n%{_bindir}/$f-3\n%{_bindir}/$f-%{python3_version}" >> py3_bins
-done
+%install
+%pyproject_install
+%pyproject_save_files %{srcname}
 
 # Integrate bash completion with the bash-completion package
+install -d %{buildroot}%{_datadir}/bash-completion/completions
 cp -af %{buildroot}%{_datadir}/%{srcname}-completion/vcs.bash %{buildroot}%{_datadir}/bash-completion/completions/vcs
-ln -sf vcs %{buildroot}%{_datadir}/bash-completion/completions/vcs-3
-ln -s vcs %{buildroot}%{_datadir}/bash-completion/completions/vcs-%{python3_version}
 
 
 %check
 # We skip two classes of test:
 # 1. Code style
 # 2. Tests which require network access
-%define pytest_options \\\
-  --ignore=test/test_flake8.py \\\
-  --ignore test/test_commands.py \\\
-  test
+PYTHONWARNINGS=ignore %pytest --ignore=test/test_flake8.py --ignore=test/test_commands.py
 
-PYTHONWARNINGS=ignore \
-  %{__python3} -m pytest %pytest_options
 
-
-%files -n python%{python3_pkgversion}-%{srcname} -f py3_bins
-%license LICENSE
+%files -n python3-%{srcname} -f %{pyproject_files}
 %doc CONTRIBUTING.md README.rst
-%{python3_sitelib}/%{srcname}/
-%{python3_sitelib}/%{srcname}-%{version}-py%{python3_version}.egg-info/
-%{_datadir}/%{srcname}-completion
+%{_bindir}/vcs*
+%{_datadir}/%{srcname}-completion/
 %{_datadir}/bash-completion/completions/vcs
-%{_datadir}/bash-completion/completions/vcs-3
-%{_datadir}/bash-completion/completions/vcs-%{python3_version}
 
 
 %changelog
 %autochangelog
+