[mingw32-gcc] Update to gcc 4.7 20120106 snapshot

[Erik van Pienbroek]

commit 0ec7ecc25fbd46104b9357e3c03bf9e4e5891eda
Author: Erik van Pienbroek 
Date:   Wed Jan 11 00:43:07 2012 +0100

Update to gcc 4.7 20120106 snapshot

.gitignore       |    1 +
 mingw32-gcc.spec |   28 ++++++++++++++++++++++------
 sources          |    2 +-
 3 files changed, 24 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a5eff51..186e901 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 gcc-4.5.1.tar.bz2
 /gcc-4.5.3.tar.bz2
 /gcc-4.6.1.tar.bz2
+/gcc-4.7.0-20120106.tar.bz2
diff --git a/mingw32-gcc.spec b/mingw32-gcc.spec
index f95c675..9cbfe1c 100644
--- a/mingw32-gcc.spec
+++ b/mingw32-gcc.spec
@@ -1,14 +1,20 @@
 %global __os_install_post /usr/lib/rpm/brp-compress %{nil}
+%global snapshot_date 20120106

Name:           mingw32-gcc
-Version:        4.6.1
-Release:        3%{?dist}.2
+Version:        4.7.0
+Release:        0.1.%{snapshot_date}%{?dist}
 Summary:        MinGW Windows cross-compiler (GCC) for C

License:        GPLv3+ and GPLv3+ with exceptions and GPLv2+ with exceptions
 Group:          Development/Languages
 URL:            http://gcc.gnu.org
-Source0:        ftp://ftp.gnu.org/gnu/gcc/gcc-%{version}/gcc-%{version}.tar.bz2
+# The source for this package was pulled from upstream's vcs.  Use the
+# following commands to generate the tarball:
+# svn export svn://gcc.gnu.org/svn/gcc/branches/redhat/gcc-4_7-branch@%{SVNREV} gcc-%{version}-%{snapshot_date}
+# tar cf - gcc-%{version}-%{DATE} | bzip2 -9 > gcc-%{version}-%{snapshot_date}.tar.bz2
+Source0:        gcc-%{version}-%{snapshot_date}.tar.bz2
+#Source0:        ftp://ftp.gnu.org/gnu/gcc/gcc-%{version}/gcc-%{version}.tar.bz2
 Patch0:         gcc-1-mingw-float.patch

BuildRequires:  texinfo
@@ -83,7 +89,7 @@ MinGW Windows cross-compiler for FORTRAN.

%prep
-%setup -q -n gcc-%{version}
+%setup -q -n gcc-%{version}-%{snapshot_date}
 %patch0 -p1 -b .float
 echo 'Fedora MinGW %{version}-%{release}' > gcc/DEV-PHASE

@@ -151,14 +157,20 @@ mv $RPM_BUILD_ROOT%{_libdir}/gcc/%{_mingw32_target}/%{version}/*.dll \
 # Don't want the *.la files.
 find $RPM_BUILD_ROOT -name '*.la' -delete

+# For some reason there are wrapper libraries created named $target-$target-gcc-$tool
+# Drop those files for now as this looks like a bug in GCC
+rm -f $RPM_BUILD_ROOT%{_bindir}/%{_mingw32_target}-%{_mingw32_target}-*
+
 popd

%files
 %{_bindir}/%{_mingw32_target}-gcc
 %{_bindir}/%{_mingw32_target}-gcc-%{version}
+%{_bindir}/%{_mingw32_target}-gcc-ar
+%{_bindir}/%{_mingw32_target}-gcc-nm
+%{_bindir}/%{_mingw32_target}-gcc-ranlib
 %{_bindir}/%{_mingw32_target}-gcov
-%{_prefix}/%{_mingw32_target}/lib/libiberty.a
 %dir %{_libdir}/gcc/%{_mingw32_target}
 %dir %{_libdir}/gcc/%{_mingw32_target}/%{version}
 %{_libdir}/gcc/%{_mingw32_target}/%{version}/crtbegin.o
@@ -224,7 +236,7 @@ popd
 %{_libdir}/gcc/%{_mingw32_target}/%{version}/libobjc.a
 %{_libdir}/gcc/%{_mingw32_target}/%{version}/libobjc.dll.a
 %{_libexecdir}/gcc/%{_mingw32_target}/%{version}/cc1obj
-%{_mingw32_bindir}/libobjc-3.dll
+%{_mingw32_bindir}/libobjc-4.dll

%files objc++
@@ -238,6 +250,7 @@ popd
 %{_libdir}/gcc/%{_mingw32_target}/%{version}/libgfortran.dll.a
 %{_libdir}/gcc/%{_mingw32_target}/%{version}/libgfortran.spec
 %{_libdir}/gcc/%{_mingw32_target}/%{version}/libgfortranbegin.a
+%{_libdir}/gcc/%{_mingw32_target}/%{version}/libcaf_single.a
 %{_libdir}/gcc/%{_mingw32_target}/%{version}/libquadmath.a
 %{_libdir}/gcc/%{_mingw32_target}/%{version}/libquadmath.dll.a
 %dir %{_libdir}/gcc/%{_mingw32_target}/%{version}/finclude
@@ -251,6 +264,9 @@ popd

%changelog
+* Tue Jan 10 2012 Erik van Pienbroek  - 4.7.0-0.1.20120106
+- Update to gcc 4.7 20120106 snapshot
+
 * Wed Oct 26 2011 Marcela Mašláňová  - 4.6.1-3.2
 - rebuild with new gmp without compat lib

diff --git a/sources b/sources
index 1305632..727576e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c57a9170c677bf795bdc04ed796ca491  gcc-4.6.1.tar.bz2
+880d74d47fad9799b9e3f98c61c5213f  gcc-4.7.0-20120106.tar.bz2