Revert "Add patch for automake bug#31222"
This reverts commit 75c9a9730a
.
This commit is contained in:
parent
75c9a9730a
commit
c54edf6315
|
@ -1,31 +0,0 @@
|
||||||
From a348d830659fffd2cfc42994524783b07e69b4b5 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Mathieu Lirzin <mthl@gnu.org>
|
|
||||||
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
|
|
||||||
|
|
|
@ -28,11 +28,6 @@ Source3: http://git.savannah.gnu.org/cgit/config.git/plain/config.guess
|
||||||
Patch0: automake-1.15-disable-vala-tests.patch
|
Patch0: automake-1.15-disable-vala-tests.patch
|
||||||
%endif
|
%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/
|
URL: http://www.gnu.org/software/automake/
|
||||||
Requires: autoconf >= 2.65
|
Requires: autoconf >= 2.65
|
||||||
|
|
||||||
|
@ -141,8 +136,8 @@ make -k %{?_smp_mflags} check %{?TESTS_FLAGS: TESTS="%{TESTS_FLAGS}"} \
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Tue Jun 04 2019 Patrik Novotný <panovotn@redhat.com> - 1.16.1-10
|
* Mon May 13 2019 Jakub Janco <jjanco@redhat.com> - 1.16.1-10
|
||||||
- Upstream patch fixing automake bug#31222
|
- do not mangle shebang in files which are part of bootstraped project
|
||||||
|
|
||||||
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.16.1-9
|
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.16.1-9
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||||
|
|
Loading…
Reference in New Issue