From 9eae0ccaf1f54b46b3c9e1d164a8ea98d0bb20e5 Mon Sep 17 00:00:00 2001 From: Miro HronĨok Date: Nov 02 2021 15:05:11 +0000 Subject: Move import_all_modules out of python-srpm-macros There's no need for it in the default buildroot. --- diff --git a/python-rpm-macros.spec b/python-rpm-macros.spec index aaeddd9..0f68adc 100644 --- a/python-rpm-macros.spec +++ b/python-rpm-macros.spec @@ -86,7 +86,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 @@ -130,11 +130,11 @@ install -m 755 brp-* %{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 %{_rpmconfigdir}/redhat/brp-python-bytecompile %{_rpmconfigdir}/redhat/brp-python-hardlink %{_rpmconfigdir}/redhat/brp-fix-pyc-reproducibility @@ -152,6 +152,7 @@ Resolves: rhbz#2018809 Resolves: rhbz#2018615 - Process .pth files in buildroot's sitedirs in %%py_check_import Resolves: rhbz#2018551 +- Move import_all_modules.py from python-srpm-macros to python-rpm-macros * Mon Oct 25 2021 Karolina Surma - 3.10-12 - Introduce -f (read from file) option to %%py{3}_check_import