From f3ca3c472d3e9c15043ea86eeee70f7f174b0da1 Mon Sep 17 00:00:00 2001
From: Jon Ciesla <limburgher@gmail.com>
Date: Oct 15 2012 20:03:47 +0000
Subject: Merge branch 'master' of ssh://pkgs.fedoraproject.org/gcc


Conflicts:
	gcc.spec

---

diff --git a/.gitignore b/.gitignore
index 732186f..4038c66 100644
--- a/.gitignore
+++ b/.gitignore
@@ -44,3 +44,4 @@
 /gcc-4.7.2-20120921.tar.bz2
 /gcc-4.7.2-20121001.tar.bz2
 /gcc-4.7.2-20121009.tar.bz2
+/gcc-4.7.2-20121015.tar.bz2
diff --git a/gcc.spec b/gcc.spec
index 093c2c7..d3646b3 100644
--- a/gcc.spec
+++ b/gcc.spec
@@ -1,9 +1,9 @@
-%global DATE 20121009
-%global SVNREV 192248
+%global DATE 20121015
+%global SVNREV 192447
 %global gcc_version 4.7.2
 # Note, gcc_release must be integer, if you want to add suffixes to
 # %{release}, append them after %{gcc_release} on Release: line.
-%global gcc_release 5
+%global gcc_release 6
 %global _unpackaged_files_terminate_build 0
 %global multilib_64_archs sparc64 ppc64 s390x x86_64
 %ifarch %{ix86} x86_64 ia64 ppc ppc64 alpha
@@ -2662,9 +2662,13 @@ fi
 %{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_version}/plugin
 
 %changelog
-* Mon Oct 15 2012 Jon Ciesla <limburgher@gmail.com> 4.7.2-5
+* Mon Oct 15 2012 Jon Ciesla <limburgher@gmail.com> 4.7.2-6
 - Provides: bundled(libiberty)
 
+* Mon Oct 15 2012 Jakub Jelinek <jakub@redhat.com> 4.7.2-5
+- update from the 4.7 branch
+  - PRs fortran/54784, libfortran/54736, libstdc++/54861
+
 * Tue Oct  9 2012 Jakub Jelinek <jakub@redhat.com> 4.7.2-4
 - update from the 4.7 branch
   - PRs c++/54777, c++/54858, debug/53135, target/54741, target/54785,
diff --git a/sources b/sources
index 664e5e6..f92fea9 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 2659f09c2e43ef8b7d4406321753f1b2  fastjar-0.97.tar.gz
-57efcf9b68bb9f6e739a16f4673230d0  gcc-4.7.2-20121009.tar.bz2
+2891991f350ae9f513b8070beab43611  gcc-4.7.2-20121015.tar.bz2