From b029d58d419cb08017659024e663dce0a4e8207b Mon Sep 17 00:00:00 2001 From: Petr Matousek Date: Sun, 19 May 2024 19:30:07 +0200 Subject: [PATCH] clippy: test --- make-srpm.sh | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/make-srpm.sh b/make-srpm.sh index 20abd62..f3c4727 100755 --- a/make-srpm.sh +++ b/make-srpm.sh @@ -94,11 +94,7 @@ BuildRequires: help2man %if 0%{?rhel} == 7 %global python3_pkgversion 36 - -# needed for /usr/share/csmock/scripts/convert-clippy.py because byte-compilation -# on el7 was failing as el7 rpmbuild defaults to Python 2.7 for Python scripts in -# unversioned directories -%global _python_bytecompile_errors_terminate_build 0 +%global __python %{python3} %endif BuildRequires: python%{python3_pkgversion}-GitPython @@ -327,7 +323,10 @@ This package contains the unicontrol plug-in for csmock. %{python3_sitelib}/csmock/plugins/__pycache__/clang.* %files -n csmock-plugin-clippy -%{_datadir}/csmock/scripts/convert-clippy.py +%{_datadir}/csmock/scripts/convert-clippy.py* +%if 0%{?rhel} == 7 +%{_datadir}/csmock/scripts/__pycache__/convert-clippy.* +%endif %{_datadir}/csmock/scripts/inject-clippy.sh %{python3_sitelib}/csmock/plugins/clippy.py* %{python3_sitelib}/csmock/plugins/__pycache__/clippy.* @@ -346,6 +345,9 @@ This package contains the unicontrol plug-in for csmock. %files -n csmock-plugin-infer %{_datadir}/csmock/scripts/filter-infer.py* +%if 0%{?rhel} == 7 +%{_datadir}/csmock/scripts/__pycache__/filter-infer.* +%endif %{_datadir}/csmock/scripts/install-infer.sh %{python3_sitelib}/csmock/plugins/infer.py* %{python3_sitelib}/csmock/plugins/__pycache__/infer.* @@ -386,6 +388,9 @@ This package contains the unicontrol plug-in for csmock. %files -n csmock-plugin-unicontrol %{_datadir}/csmock/scripts/find-unicode-control.py* +%if 0%{?rhel} == 7 +%{_datadir}/csmock/scripts/__pycache__/find-unicode-control.* +%endif %{python3_sitelib}/csmock/plugins/unicontrol.py* %{python3_sitelib}/csmock/plugins/__pycache__/unicontrol.* EOF