diff options
| author | Pavel Raiskup <praiskup@redhat.com> | 2016-06-17 08:11:57 +0200 |
|---|---|---|
| committer | Pavel Raiskup <praiskup@redhat.com> | 2016-06-17 08:11:57 +0200 |
| commit | cde1d1387e43a8b3a4784f4e6e5f75810b0dae23 (patch) | |
| tree | 8f7d18e3ea49999f05e776237c92003655b07ac6 | |
| parent | ba74b9d7a28004d53ca89239dea14c917acc781a (diff) | |
| download | scl-autotools-cde1d1387e43a8b3a4784f4e6e5f75810b0dae23.tar.gz scl-autotools-cde1d1387e43a8b3a4784f4e6e5f75810b0dae23.tar.xz scl-autotools-cde1d1387e43a8b3a4784f4e6e5f75810b0dae23.zip | |
automake-git: remove upstreamed patch
| -rw-r--r-- | repos/autotools/autotools-git/automake/automake-1.15-perl-escape-curly-bracket.patch | 21 | ||||
| -rw-r--r-- | repos/autotools/autotools-git/automake/automake.spec | 2 |
2 files changed, 0 insertions, 23 deletions
diff --git a/repos/autotools/autotools-git/automake/automake-1.15-perl-escape-curly-bracket.patch b/repos/autotools/autotools-git/automake/automake-1.15-perl-escape-curly-bracket.patch deleted file mode 100644 index 7c22c4e..0000000 --- a/repos/autotools/autotools-git/automake/automake-1.15-perl-escape-curly-bracket.patch +++ /dev/null @@ -1,21 +0,0 @@ -From: Pavel Raiskup <praiskup@redhat.com> -Date: Tue, 7 Jul 2015 10:54:24 +0200 -Subject: [PATCH 2/2] bin/automake: escape '{' in regexp pattern - -Resolves: rhbz#1239379 -Upstream report: -http://debbugs.gnu.org/cgi/bugreport.cgi?bug=21001 - -diff --git a/bin/automake.in b/bin/automake.in -index eedc8bc..a679d16 100644 ---- a/bin/automake.in -+++ b/bin/automake.in -@@ -3878,7 +3878,7 @@ sub substitute_ac_subst_variables_worker - sub substitute_ac_subst_variables - { - my ($text) = @_; -- $text =~ s/\${([^ \t=:+{}]+)}/substitute_ac_subst_variables_worker ($1)/ge; -+ $text =~ s/\$\{([^ \t=:+{}]+)}/substitute_ac_subst_variables_worker ($1)/ge; - return $text; - } - diff --git a/repos/autotools/autotools-git/automake/automake.spec b/repos/autotools/autotools-git/automake/automake.spec index 305628d..a5c9f78 100644 --- a/repos/autotools/autotools-git/automake/automake.spec +++ b/repos/autotools/autotools-git/automake/automake.spec @@ -26,7 +26,6 @@ Source3: http://git.savannah.gnu.org/cgit/config.git/plain/config.guess # Keep those patches in 'git format-patch' format (with docs). Patch0: automake-1.15-disable-vala-tests.patch -Patch1: automake-1.15-perl-escape-curly-bracket.patch URL: http://www.gnu.org/software/automake/ Requires: %{?scl_prefix}autoconf >= 2.65 @@ -104,7 +103,6 @@ Makefiles. %prep %setup -q -n automake-%{version} %patch0 -p1 -b .disable_tests -%patch1 -p1 -b .curly_bracket # to use this, we should 100% *know* what the patches do find -exec touch --date=`date -I` {} + |