From b790ba84fd41044ac2b3cc9af99061583674eda9 Mon Sep 17 00:00:00 2001
From: Jakub Jelinek <jakub@fedoraproject.org>
Date: Mon, 12 Mar 2007 08:08:02 +0000
Subject: [PATCH] 4.1.2-4

---
 gcc41.spec | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/gcc41.spec b/gcc41.spec
index 95f296d..344dfc5 100644
--- a/gcc41.spec
+++ b/gcc41.spec
@@ -1,6 +1,6 @@
-%define DATE 20070222
+%define DATE 20070312
 %define gcc_version 4.1.2
-%define gcc_release 3
+%define gcc_release 4
 %define _unpackaged_files_terminate_build 0
 %define multilib_64_archs sparc64 ppc64 s390x x86_64
 %define include_gappletviewer 1
@@ -138,10 +138,9 @@ Patch26: gcc41-pr29059.patch
 Patch27: gcc41-strncat-chk.patch
 Patch28: gcc41-pr29299.patch
 Patch29: gcc41-pr30113.patch
-Patch30: gcc41-pr25392.patch
+Patch30: gcc41-rh228769.patch
 Patch31: gcc41-pr30045.patch
 Patch32: gcc41-rh227376.patch
-Patch33: gcc41-java-zoneinfo.patch
 %define _gnu %{nil}
 %ifarch sparc
 %define gcc_target_platform sparc64-%{_vendor}-%{_target_os}
@@ -447,10 +446,9 @@ which are required to run programs compiled with the GNAT.
 %patch27 -p0 -b .strncat-chk~
 %patch28 -p0 -b .pr29299~
 %patch29 -p0 -b .pr30113~
-%patch30 -p0 -b .pr25392~
+%patch30 -p0 -b .rh228769~
 %patch31 -p0 -b .pr30045~
 %patch32 -p0 -b .rh227376~
-%patch33 -p0 -b .java-zoneinfo~
 
 sed -i -e 's/4\.1\.3/4.1.2/' gcc/BASE-VER gcc/version.c
 sed -i -e 's/" (Red Hat[^)]*)"/" (Red Hat %{version}-%{gcc_release})"/' gcc/version.c
@@ -1563,6 +1561,15 @@ fi
 %doc rpm.doc/changelogs/libmudflap/ChangeLog*
 
 %changelog
+* Mon Mar 12 2007 Jakub Jelinek <jakub@redhat.com> 4.1.2-4
+- update from gcc-4_1-branch (-r122219:122833)
+  - PRs c++/30852, c++/30895, classpath/28550, classpath/30831,
+	classpath/30906, classpath/30983, fortran/29441, fortran/30400,
+	libgcj/17002, libgfortran/30910, libgfortran/30918, other/31050,
+	rtl-optimization/30931, target/30848, tree-optimization/29925
+  - reenable memory CSE (Alexandre Oliva, #229366, PR rtl-optimization/30643)
+- fix random seed handling with -frepo (Alexandre Oliva, #228769)
+
 * Thu Feb 22 2007 Jakub Jelinek <jakub@redhat.com> 4.1.2-3
 - update from gcc-4_1-branch (-r122163:122219)
   - PR ada/30684