diff --git a/macros.python b/macros.python index 8ad1161..1fcea41 100644 --- a/macros.python +++ b/macros.python @@ -1,5 +1,6 @@ %py_setup setup.py %py_shbang_opts -s +%py_shbang_opts_nodash %(opts=%{py_shbang_opts}; echo ${opts#-}) # Use the slashes after expand so that the command starts on the same line as # the macro diff --git a/macros.python2 b/macros.python2 index 38c6eb9..289bac5 100644 --- a/macros.python2 +++ b/macros.python2 @@ -4,6 +4,7 @@ %python2_version_nodots %(%{__python2} -Esc "import sys; sys.stdout.write('{0.major}{0.minor}'.format(sys.version_info))") %py2_shbang_opts -s +%py2_shbang_opts_nodash %(opts=%{py2_shbang_opts}; echo ${opts#-}) # Use the slashes after expand so that the command starts on the same line as # the macro diff --git a/macros.python3 b/macros.python3 index 646ae86..97a5089 100644 --- a/macros.python3 +++ b/macros.python3 @@ -6,6 +6,7 @@ %py3dir %{_builddir}/python3-%{name}-%{version}-%{release} %py3_shbang_opts -s +%py3_shbang_opts_nodash %(opts=%{py3_shbang_opts}; echo ${opts#-}) # Use the slashes after expand so that the command starts on the same line as # the macro diff --git a/python-rpm-macros.spec b/python-rpm-macros.spec index 6134b28..fc089c0 100644 --- a/python-rpm-macros.spec +++ b/python-rpm-macros.spec @@ -1,6 +1,6 @@ Name: python-rpm-macros Version: 3 -Release: 44%{?dist} +Release: 45%{?dist} Summary: The unversioned Python RPM macros License: MIT @@ -73,6 +73,9 @@ install -m 644 %{SOURCE0} %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} \ %changelog +* Fri Feb 07 2020 Miro Hrončok - 3-45 +- Define %%py(2|3)?_shbang_opts_nodash to be used with pathfix.py -a + * Sat Dec 28 2019 Miro Hrončok - 3-44 - Define %%python, but make it work only if %%__python is redefined - Add the %%pycached macro