[gcc] Avoid applying patch 16 twice.

Kyle McMartin kyle at fedoraproject.org
Wed Jun 18 22:37:15 UTC 2014


commit 7e9585f371b761e47a0bad48d52059dca4684a0a
Author: Kyle McMartin <kyle at mcmartin.ca>
Date:   Wed Jun 18 18:36:51 2014 -0400

    Avoid applying patch 16 twice.

 gcc.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/gcc.spec b/gcc.spec
index f2be102..e3dcaec 100644
--- a/gcc.spec
+++ b/gcc.spec
@@ -722,7 +722,7 @@ package or when debugging this package.
 %patch15 -p0 -b .color-auto~
 %endif
 %patch16 -p0 -b .libgo-p224~
-%patch16 -p1 -b .pr61545~
+%patch17 -p1 -b .pr61545~
 rm -f libgo/go/crypto/elliptic/p224{,_test}.go
 
 %if 0%{?_enable_debug_packages}
@@ -2784,7 +2784,10 @@ fi
 %{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_version}/plugin
 
 %changelog
-* Wed Jun 18 2014 Richard Henderson <rth at redhat.com> 4.9.0-11
+* Wed Jun 18 2014 Kyle McMartin <kyle at redhat.com> 4.9.0-11
+- Avoid applying patch 16 twice.
+
+* Wed Jun 18 2014 Richard Henderson <rth at redhat.com>
 - Import fix for target/pr61545 from the 4.9 branch.
 
 * Tue Jun 17 2014 Jakub Jelinek <jakub at redhat.com> 4.9.0-10


More information about the scm-commits mailing list