From c9f6636cc638db4cf3040e86093924f0e9b710ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 2 Nov 2021 15:05:11 +0000 Subject: [PATCH] Move import_all_modules out of python-srpm-macros There's no need for it in the default buildroot. Related: rhbz#1950291 --- python-rpm-macros.spec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/python-rpm-macros.spec b/python-rpm-macros.spec index 2b4802b..fc07406 100644 --- a/python-rpm-macros.spec +++ b/python-rpm-macros.spec @@ -57,7 +57,7 @@ Summary: RPM macros for building Python 3 packages # For %%__python3 and %%python3 Requires: python-srpm-macros = %{version}-%{release} -# For %%py_setup +# For %%py_setup and import_all_modules.py Requires: python-rpm-macros = %{version}-%{release} %description -n python3-rpm-macros @@ -89,11 +89,11 @@ install -m 644 import_all_modules.py %{buildroot}%{_rpmconfigdir}/redhat/ %files %{rpmmacrodir}/macros.python %{rpmmacrodir}/macros.pybytecompile +%{_rpmconfigdir}/redhat/import_all_modules.py %files -n python-srpm-macros %{rpmmacrodir}/macros.python-srpm %{_rpmconfigdir}/redhat/compileall2.py -%{_rpmconfigdir}/redhat/import_all_modules.py %{_rpmluadir}/fedora/srpm/python.lua %files -n python3-rpm-macros @@ -105,6 +105,7 @@ install -m 644 import_all_modules.py %{buildroot}%{_rpmconfigdir}/redhat/ - Fix multiline arguments processing for %%py_check_import - Fix %%py_shebang_flags handling within %%py_check_import - Process .pth files in buildroot's sitedirs in %%py_check_import +- Move import_all_modules.py from python-srpm-macros to python-rpm-macros * Mon Oct 25 2021 Karolina Surma - 3.9-45 - Introduce -f (read from file) option to %%py{3}_check_import