[mingw-gcc] Switch to the release tarball

Kalev Lember kalev at fedoraproject.org
Tue Apr 3 23:03:08 UTC 2012


commit 8022c65875364a74b283622484a37e9ce3500ca0
Author: Kalev Lember <kalevlember at gmail.com>
Date:   Wed Apr 4 02:00:53 2012 +0300

    Switch to the release tarball

 .gitignore     |    1 +
 mingw-gcc.spec |   19 +++++++++----------
 sources        |    2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d00b4e7..b4724bb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ gcc-4.5.1.tar.bz2
 /gcc-4.7.0-20120126.tar.bz2
 /gcc-4.7.0-20120224.tar.bz2
 /gcc-4.7.0-20120322.tar.bz2
+/gcc-4.7.0.tar.bz2
diff --git a/mingw-gcc.spec b/mingw-gcc.spec
index 3fa8ada..07b403c 100644
--- a/mingw-gcc.spec
+++ b/mingw-gcc.spec
@@ -15,22 +15,15 @@
 # Run the testsuite
 %global enable_tests 0
 
-%global snapshot_date 20120322
-
 Name:           mingw-gcc
 Version:        4.7.0
-Release:        1.%{snapshot_date}%{?dist}
+Release:        2%{?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
-# 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
+Source0:        ftp://ftp.gnu.org/gnu/gcc/gcc-%{version}/gcc-%{version}.tar.bz2
 
 BuildRequires:  texinfo
 BuildRequires:  mingw32-filesystem >= 95
@@ -200,7 +193,7 @@ needed for OpenMP v3.0 support for the win32 target.
 
 
 %prep
-%setup -q -n gcc-%{version}-%{snapshot_date}
+%setup -q -n gcc-%{version}
 echo 'Fedora MinGW %{version}-%{release}' > gcc/DEV-PHASE
 
 
@@ -622,6 +615,12 @@ rm -f $RPM_BUILD_ROOT%{_bindir}/%{mingw64_target}-%{mingw64_target}-*
 
 
 %changelog
+* Wed Apr 04 2012 Kalev Lember <kalevlember at gmail.com> - 4.7.0-2
+- Fix the build
+- Switch to the release tarball
+- Disable the testsuite again to avoid breaking build on arches where
+  wine is unavailable
+
 * Wed Mar 28 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 4.7.0-1.20120322
 - Update to gcc 4.7.0 final release (20120322 snapshot)
 - Dropped upstreamed patches
diff --git a/sources b/sources
index ffab66c..88f8413 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-94a2e611439eddb196421be8dee7828e  gcc-4.7.0-20120322.tar.bz2
+2a0f1d99fda235c29d40b561f81d9a77  gcc-4.7.0.tar.bz2


More information about the scm-commits mailing list