From 684acb2149c871c5eeed8bf93418a238aefce424 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Sat, 21 Jul 2012 00:14:35 +0300 Subject: [PATCH] Revert back to 4.7.1 final Use a known good gcc release for the F18 mass rebuild without issues such as PR54038. We are better off with a stable toolchain so that we can work on issues higher up the stack. This reverts commit bd4935cba69ad28754f6358fd95421691938caf5. --- .gitignore | 1 - mingw-gcc.spec | 21 ++++----------------- sources | 2 +- 3 files changed, 5 insertions(+), 19 deletions(-) diff --git a/.gitignore b/.gitignore index acd07aa..258f8ec 100644 --- a/.gitignore +++ b/.gitignore @@ -7,4 +7,3 @@ gcc-4.5.1.tar.bz2 /gcc-4.7.0-20120322.tar.bz2 /gcc-4.7.0.tar.bz2 /gcc-4.7.1.tar.bz2 -/gcc-4.7.1-20120718.tar.bz2 diff --git a/mingw-gcc.spec b/mingw-gcc.spec index a8ab207..9df1e52 100644 --- a/mingw-gcc.spec +++ b/mingw-gcc.spec @@ -15,25 +15,15 @@ # Run the testsuite %global enable_tests 0 -%global snapshot_date 20120718 - Name: mingw-gcc Version: 4.7.1 -Release: 2.%{snapshot_date}%{?dist} +Release: 3%{?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 -%if 0%{?snapshot_date} -# 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 -%else Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{version}/gcc-%{version}.tar.bz2 -%endif BuildRequires: texinfo BuildRequires: mingw32-filesystem >= 95 @@ -203,13 +193,7 @@ needed for OpenMP v3.0 support for the win32 target. %prep -%if 0%{?snapshot_date} -%setup -q -n gcc-%{version}-%{snapshot_date} -sed -i -e 's/4\.7\.2/4.7.1/' gcc/BASE-VER -%else %setup -q -n gcc-%{version} -%endif - echo 'Fedora MinGW %{version}-%{release}' > gcc/DEV-PHASE @@ -631,6 +615,9 @@ rm -f $RPM_BUILD_ROOT%{_bindir}/%{mingw64_target}-%{mingw64_target}-* %changelog +* Sat Jul 21 2012 Kalev Lember - 4.7.1-3 +- Revert back to 4.7.1 final + * Wed Jul 18 2012 Erik van Pienbroek - 4.7.1-2.20120718 - Update to gcc 4.7 20120718 snapshot diff --git a/sources b/sources index 65e1ee8..9392aff 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0de28e680208fc056f38b62decbed062 gcc-4.7.1-20120718.tar.bz2 +933e6f15f51c031060af64a9e14149ff gcc-4.7.1.tar.bz2