From e2700d7d70a21f9a89adc1073e5c2d84c45ffa90 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Mar 30 2021 14:05:28 +0000 Subject: import automake-1.16.1-7.el8 --- diff --git a/SOURCES/automake-1.16-pep3147-tweak-fix.patch b/SOURCES/automake-1.16-pep3147-tweak-fix.patch new file mode 100644 index 0000000..c9f278f --- /dev/null +++ b/SOURCES/automake-1.16-pep3147-tweak-fix.patch @@ -0,0 +1,48 @@ +diff --git a/lib/am/python.am b/lib/am/python.am +index 21e6f842c..e29ecfcd0 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|[^/]*$$|__pycache__/&.*.py|' + + .PHONY uninstall-am: uninstall-%DIR%PYTHON + uninstall-%DIR%PYTHON: +@@ -108,19 +108,26 @@ uninstall-%DIR%PYTHON: + test -n "$$py_files" || exit 0; \ + dir='$(DESTDIR)$(%NDIR%dir)'; \ + ## Also remove the .pyc and .pyo byte compiled versions. ++## This is somewhat tricky, because for newer pythons we have to take ++## PEP-3147 into account. + pyc_files=`echo "$$py_files" | sed 's|$$|c|'`; \ + pyo_files=`echo "$$py_files" | sed 's|$$|o|'`; \ ++ py_files_pep3147=`echo "$$py_files" | $(am__pep3147_tweak)`; \ ++ echo "$$py_files_pep3147";\ ++ pyc_files_pep3147=`echo "$$py_files_pep3147" | sed 's|$$|c|'`; \ ++ pyo_files_pep3147=`echo "$$py_files_pep3147" | sed 's|$$|o|'`; \ + st=0; \ +- for files in "$$py_files" "$$pyc_files" "$$pyo_files"; do \ ++ for files in \ ++ "$$py_files" \ ++ "$$pyc_files" \ ++ "$$pyo_files" \ ++## Installation of '.py' files is not influenced by PEP-3147, so it ++## is correct *not* to have $pyfiles_pep3147 here. ++ "$$pyc_files_pep3147" \ ++ "$$pyo_files_pep3147" \ ++ ; do \ + $(am__uninstall_files_from_dir) || st=$$?; \ + done; \ +-## This is somewhat tricky, because for newer pythons we have to take PEP-3147 +-## into account. Avoid exceeding the command-line length limit. +- dir='$(DESTDIR)$(%NDIR%dir)/__pycache__'; \ +- echo "$$py_files" | $(am__pep3147_tweak) | $(am__base_list) | \ +- while read files; do \ +- $(am__uninstall_files_from_dir) || st=$$?; \ +- done || exit $$?; \ + exit $$st + endif %?INSTALL% + diff --git a/SPECS/automake.spec b/SPECS/automake.spec index 86b1edc..78ffc59 100644 --- a/SPECS/automake.spec +++ b/SPECS/automake.spec @@ -11,7 +11,7 @@ Summary: A GNU tool for automatically creating Makefiles Name: automake Version: %{api_version}.1 -Release: 6%{?dist} +Release: 7%{?dist} # docs ~> GFDL, sources ~> GPLv2+, mkinstalldirs ~> PD and install-sh ~> MIT License: GPLv2+ and GFDL and Public Domain and MIT @@ -27,6 +27,12 @@ Source3: http://git.savannah.gnu.org/cgit/config.git/plain/config.guess Patch0: automake-1.15-disable-vala-tests.patch %endif +# BZ#1759942 +# 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 @@ -122,6 +128,9 @@ make -k %{?_smp_mflags} check %{?TESTS_FLAGS: TESTS="%{TESTS_FLAGS}"} \ %changelog +* Tue May 05 2020 Patrik Novotný - 1.16.1-7 +- Upstream patch fixing automake bug#31222 + * Wed Aug 15 2018 Pavel Raiskup - 1.16.1-6 - BR imake for tests only on Fedora