#41 Define %py(2|3)?_shbang_opts_nodash to be used with pathfix.py -a
Merged 4 years ago by churchyard. Opened 4 years ago by churchyard.
rpms/ churchyard/python-rpm-macros py_shbang_opts_nodash  into  master

file modified
+1
@@ -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

file modified
+1
@@ -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

file modified
+1
@@ -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

file modified
+4 -1
@@ -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 @@ 

  

  

  %changelog

+ * Thu Feb 06 2020 Miro Hrončok <mhroncok@redhat.com> - 3-53

+ - Define %%py(2|3)?_shbang_opts_nodash to be used with pathfix.py -a

+ 

  * Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3-52

  - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild

  

no initial comment

The patch looks good. Smoke-tested by building setuptools, nothing broke. +1

Pull-Request has been merged by churchyard

4 years ago