diff --git a/multiple_flavors.patch b/multiple_flavors.patch index ac8861c..39396e7 100644 --- a/multiple_flavors.patch +++ b/multiple_flavors.patch @@ -15,20 +15,24 @@ ### flavor-specific: generate from flavor.in --- a/flavor.in +++ b/flavor.in -@@ -1,7 +1,5 @@ +@@ -1,14 +1,14 @@ ##### macro definitions for flavor "#FLAVOR#" ##### -%__#FLAVOR# /usr/bin/#FLAVOR# - %#FLAVOR#_shbang_opts %py_shbang_opts - %#FLAVOR#_prefix #FLAVOR# -@@ -10,6 +8,8 @@ - %#FLAVOR#_version %{_python_sysconfig_var #FLAVOR# py_version_short} - %#FLAVOR#_version_nodots %{_python_sysconfig_var #FLAVOR# py_version_nodot} - -+%__#FLAVOR# /usr/bin/python%{#FLAVOR#_version} ++%__#FLAVOR# /usr/bin/%{lua: print((string.gsub("#FLAVOR#", "(%w+%d)(%d)", "%1.%2")))} + + %#FLAVOR#_prefix #FLAVOR# +-%#FLAVOR#_sitelib %{_python_sysconfig_path #FLAVOR# purelib} +-%#FLAVOR#_sitearch %{_python_sysconfig_path #FLAVOR# platlib} +-%#FLAVOR#_version %{_python_sysconfig_var #FLAVOR# py_version_short} +-%#FLAVOR#_version_nodots %{_python_sysconfig_var #FLAVOR# py_version_nodot} ++%#FLAVOR#_sitelib %{_python_sysconfig_path %__#FLAVOR# purelib} ++%#FLAVOR#_sitearch %{_python_sysconfig_path %__#FLAVOR# platlib} ++%#FLAVOR#_version %{_python_sysconfig_var %__#FLAVOR# py_version_short} ++%#FLAVOR#_version_nodots %{_python_sysconfig_var %__#FLAVOR# py_version_nodot} + %#FLAVOR#_sysconfig_path() %{_rec_macro_helper}%{lua:call_sysconfig("path", "#FLAVOR#")} %#FLAVOR#_sysconfig_var() %{_rec_macro_helper}%{lua:call_sysconfig("var", "#FLAVOR#")} - diff --git a/python-rpm-macros.changes b/python-rpm-macros.changes index 71580b0..5a16090 100644 --- a/python-rpm-macros.changes +++ b/python-rpm-macros.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Sep 22 19:29:03 UTC 2020 - Matej Cepl + +- Update multiple_flavors.patch to generate correct names of the + python binary. + ------------------------------------------------------------------- Wed Sep 9 18:00:03 UTC 2020 - Matej Cepl