From e9f07b72aa3c64ff2f5b371c5ea0651b933860a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Thu, 6 Feb 2020 10:24:03 +0100 Subject: [PATCH] Define %py(2|3)?_shbang_opts_nodash to be used with pathfix.py -a --- macros.python | 1 + macros.python2 | 1 + macros.python3 | 1 + python-rpm-macros.spec | 5 ++++- 4 files changed, 7 insertions(+), 1 deletion(-) diff --git a/macros.python b/macros.python index 575ddcb..fe30d71 100644 --- a/macros.python +++ b/macros.python @@ -7,6 +7,7 @@ %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 16e8e4b..e004554 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 36c156e..f3727b7 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 322d854..c6fe8c6 100644 --- a/python-rpm-macros.spec +++ b/python-rpm-macros.spec @@ -1,6 +1,6 @@ Name: python-rpm-macros Version: 3 -Release: 52%{?dist} +Release: 53%{?dist} Summary: The unversioned Python RPM macros # macros: MIT, compileall2.py: PSFv2 @@ -78,6 +78,9 @@ install -m 644 %{SOURCE5} \ %changelog +* Thu Feb 06 2020 Miro HronĨok - 3-53 +- Define %%py(2|3)?_shbang_opts_nodash to be used with pathfix.py -a + * Thu Jan 30 2020 Fedora Release Engineering - 3-52 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild