From 28cb1fda8480fe5dd2e34a30b07d9fa6335917eb Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Thu, 22 Mar 2018 01:38:31 -0400 Subject: [PATCH] Drop .py extension from contrib/hooks/multimail/git_multimail.py MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fedora 28 prints a deprecation notice if /usr/bin/python is called in an rpm build¹, which is done by default when byte-compiling python files outside of %{_libdir}/pythonX.X. Avoid the issue by dropping the .py extension from the multimail hook script. The hook script is not used as a module and therefore has no need to use the extension or be byte-compiled. ¹ https://fedoraproject.org/wiki/Changes/Avoid_usr_bin_python_in_RPM_Build --- git.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/git.spec b/git.spec index 5489901..85a57ac 100644 --- a/git.spec +++ b/git.spec @@ -60,7 +60,7 @@ Name: git Version: 2.17.0 -Release: 0.1%{?rcrev}%{?dist} +Release: 0.1%{?rcrev}%{?dist}.1 Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -545,6 +545,9 @@ mkdir -p %{buildroot}%{_datadir}/git-core/contrib/completion install -pm 644 contrib/completion/git-completion.tcsh \ %{buildroot}%{_datadir}/git-core/contrib/completion/ +# Drop .py extension from git_multimail to avoid byte-compiling +mv contrib/hooks/multimail/git_multimail{.py,} + # Move contrib/hooks out of %%docdir and make them executable mkdir -p %{buildroot}%{_datadir}/git-core/contrib mv contrib/hooks %{buildroot}%{_datadir}/git-core/contrib @@ -809,6 +812,9 @@ make test || ./print-failed-test-output %{?with_docs:%{_pkgdocdir}/*svn*.html} %changelog +* Thu Mar 22 2018 Todd Zullinger - 2.17.0-0.1.rc1.1 +- Drop .py extension from contrib/hooks/multimail/git_multimail.py + * Wed Mar 21 2018 Todd Zullinger - 2.17.0-0.1.rc1 - Update to 2.17.0-rc1