[gcc: 2/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/gcc

[Jon Ciesla]

commit f3ca3c472d3e9c15043ea86eeee70f7f174b0da1
Merge: dd781f0 b62b282
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Mon Oct 15 15:03:47 2012 -0500

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/gcc
    
    Conflicts:
    	gcc.spec

 .gitignore |    1 +
 gcc.spec   |   12 ++++++++----
 sources    |    2 +-
 3 files changed, 10 insertions(+), 5 deletions(-)
---
diff --cc gcc.spec
index 093c2c7,5e064a8..d3646b3
--- a/gcc.spec
+++ b/gcc.spec
@@@ -3,7 -3,7 +3,7 @@@
  %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 -2661,10 +2662,13 @@@ f
  %{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_version}/plugin
  
  %changelog
- * Mon Oct 15 2012 Jon Ciesla <limburgher at gmail.com> 4.7.2-5
++* Mon Oct 15 2012 Jon Ciesla <limburgher at gmail.com> 4.7.2-6
 +- Provides: bundled(libiberty)
 +
+ * Mon Oct 15 2012 Jakub Jelinek <jakub at 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 at redhat.com> 4.7.2-4
  - update from the 4.7 branch
    - PRs c++/54777, c++/54858, debug/53135, target/54741, target/54785,