diff --git a/automake-1.16-pep3147-tweak-fix.patch b/automake-1.16-pep3147-tweak-fix.patch new file mode 100644 index 0000000..ba1cf43 --- /dev/null +++ b/automake-1.16-pep3147-tweak-fix.patch @@ -0,0 +1,31 @@ +From a348d830659fffd2cfc42994524783b07e69b4b5 Mon Sep 17 00:00:00 2001 +From: Mathieu Lirzin +Date: Sun, 8 Jul 2018 23:41:42 +0200 +Subject: python: Don't use '\n' in sed substitution + +This change fixes automake bug#31222. + +On macOS, 'sed' interprets '\n' in the substitution text as the letter 'n' +instead of as a newline. + +* lib/am/python.am [?FIRST?] (am__pep3147_tweak): Use a space instead of '\n'. +--- + lib/am/python.am | 2 +- + 1 files changed, 1 insertions(+), 1 deletion(-) + +diff --git a/lib/am/python.am b/lib/am/python.am +index 21e6f84..c855cdd 100644 +--- a/lib/am/python.am ++++ b/lib/am/python.am +@@ -97,7 +97,7 @@ endif %?INSTALL% + if %?INSTALL% + + ?FIRST?am__pep3147_tweak = \ +-?FIRST? sed -e 's|\.py$$||' -e 's|[^/]*$$|&.*.pyc\n&.*.pyo|' ++?FIRST? sed -e 's|\.py$$||' -e 's|[^/]*$$|&.*.pyc &.*.pyo|' + + .PHONY uninstall-am: uninstall-%DIR%PYTHON + uninstall-%DIR%PYTHON: +-- +cgit v1.0-41-gc330 + diff --git a/automake.spec b/automake.spec index 7883698..961365f 100644 --- a/automake.spec +++ b/automake.spec @@ -28,6 +28,11 @@ Source3: http://git.savannah.gnu.org/cgit/config.git/plain/config.guess Patch0: automake-1.15-disable-vala-tests.patch %endif +# BZ#1716384 +# automake bug#31222 - Don't use '\n' in sed substitution +# http://git.savannah.gnu.org/cgit/automake.git/commit/?id=a348d830659fffd2cfc42994524783b07e69b4b5 +Patch1: automake-1.16-pep3147-tweak-fix.patch + URL: http://www.gnu.org/software/automake/ Requires: autoconf >= 2.65 @@ -136,8 +141,8 @@ make -k %{?_smp_mflags} check %{?TESTS_FLAGS: TESTS="%{TESTS_FLAGS}"} \ %changelog -* Mon May 13 2019 Jakub Janco - 1.16.1-10 -- do not mangle shebang in files which are part of bootstraped project +* Tue Jun 04 2019 Patrik Novotný - 1.16.1-10 +- Upstream patch fixing automake bug#31222 * Thu Jan 31 2019 Fedora Release Engineering - 1.16.1-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild