From 41c3c050e8dbe4695a57e6b3e0815e6b20f9e0acac1ea08974a9752cc39f7c67 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Wed, 9 Sep 2020 18:03:37 +0000 Subject: [PATCH] - %__#FLAVOR# should be defined as /usr/bin/python%{#FLAVOR#_version} not just /usr/bin/#FLAVOR# OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:Factory/python-rpm-macros?expand=0&rev=108 --- multiple_flavors.patch | 19 +++++++++++++++++++ python-rpm-macros.changes | 6 ++++++ 2 files changed, 25 insertions(+) diff --git a/multiple_flavors.patch b/multiple_flavors.patch index 18dc1a6..ac8861c 100644 --- a/multiple_flavors.patch +++ b/multiple_flavors.patch @@ -13,3 +13,22 @@ ### flavor-specific: generate from flavor.in +--- a/flavor.in ++++ b/flavor.in +@@ -1,7 +1,5 @@ + ##### 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#_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 cbb54a8..71580b0 100644 --- a/python-rpm-macros.changes +++ b/python-rpm-macros.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Sep 9 18:00:03 UTC 2020 - Matej Cepl + +- %__#FLAVOR# should be defined as + /usr/bin/python%{#FLAVOR#_version} not just /usr/bin/#FLAVOR# + ------------------------------------------------------------------- Wed Sep 2 11:44:33 UTC 2020 - Matej Cepl