diff --git a/macros.platformpython b/macros.platformpython new file mode 100644 index 0000000..6145a47 --- /dev/null +++ b/macros.platformpython @@ -0,0 +1,4 @@ +%platform_python_abi %{expand: \ +%global __requires_exclude ^python\\\\(abi\\\\) = 3\\\\..$ +Requires: platform-python(abi) = %{python3_version} +} \ No newline at end of file diff --git a/macros.systempython b/macros.systempython deleted file mode 100644 index b7d1e91..0000000 --- a/macros.systempython +++ /dev/null @@ -1,4 +0,0 @@ -%system_python_abi %{expand: \ -%global __requires_exclude ^python\\\\(abi\\\\) = 3\\\\..$ -Requires: system-python(abi) = %{python3_version} -} diff --git a/platform-python.spec b/platform-python.spec index 6a0d91b..51c9d09 100644 --- a/platform-python.spec +++ b/platform-python.spec @@ -226,8 +226,8 @@ Source7: pyfuntop.stp # Written by bkabrda Source8: check-pyc-and-pyo-timestamps.py -# A simple macro that enables packages to require system-python(abi) instead of python(abi) -Source9: macros.systempython +# A simple macro that enables packages to require platform-python(abi) instead of python(abi) +Source9: macros.platformpython # Desktop menu entry for idle3 Source10: idle3.desktop @@ -1143,9 +1143,9 @@ echo '[ $? -eq 127 ] && echo "Could not find python%{LDVERSION_debug}-`uname -m` chmod +x %{buildroot}%{_bindir}/python%{LDVERSION_debug}-config %endif # with_debug_build -# System Python: Copy the executable to libexec +# Platform Python: Copy the executable to libexec mkdir -p %{buildroot}%{_libexecdir} -cp %{buildroot}%{_bindir}/python%{pybasever} %{buildroot}%{_libexecdir}/system-python +cp %{buildroot}%{_bindir}/python%{pybasever} %{buildroot}%{_libexecdir}/platform-python # ====================================================== @@ -1509,7 +1509,7 @@ fi %{_libdir}/pkgconfig/python-%{pybasever}.pc %{_libdir}/pkgconfig/python3.pc %{_rpmconfigdir}/macros.d/macros.pybytecompile%{pybasever} -%{_rpmconfigdir}/macros.d/macros.systempython +%{_rpmconfigdir}/macros.d/macros.platformpython %files tools %defattr(-,root,root,755)