- two more patches.

[packages/gcc.git] / gcc.spec

diff --git a/gcc.spec b/gcc.spec
index b805203df7c60f227f1c6c32b7c81d8fcd430ae4..3e7042166545cf9420eff1066fa2709af735e878 100644 (file)
--- a/gcc.spec
+++ b/gcc.spec
@@ -33,17 +33,17 @@ Summary(es):        Colecci
 Summary(pl):   Kolekcja kompilatorów GNU: kompilator C i pliki wspó³dzielone
 Summary(pt_BR):        Coleção dos compiladores GNU: o compilador C e arquivos compartilhados
 Name:          gcc
-Version:       4.1.0
-#define                _snap   20060218r111233
-#define                _snap   20060223
-#Release:      0.%{_snap}.5
-Release:       1
+Version:       4.1.1
+#define                _snap   20060515r113785
+%define                _snap   20060517
+Release:       0.%{_snap}.1
+#Release:      2
 Epoch:         5
 License:       GPL v2+
 Group:         Development/Languages
-#Source0:      ftp://gcc.gnu.org/pub/gcc/prerelease-%{version}-%{_snap}/gcc-%{version}-%{_snap}.tar.bz2
-Source0:       ftp://gcc.gnu.org/pub/gcc/releases/gcc-%{version}/%{name}-%{version}.tar.bz2
-# Source0-md5: 88785071f29ed0e0b6b61057a1079442
+Source0:       ftp://gcc.gnu.org/pub/gcc/prerelease-%{version}-%{_snap}/gcc-%{version}-%{_snap}.tar.bz2
+# Source0-md5: 779eca09a2abe6849f1b0fd876fb7b1f
+#Source0:      ftp://gcc.gnu.org/pub/gcc/releases/gcc-%{version}/%{name}-%{version}.tar.bz2
 #Source0:      ftp://gcc.gnu.org/pub/gcc/snapshots/4.1-%{_snap}/gcc-4.1-%{_snap}.tar.bz2
 #Source0:      gcc-4.1-%{_snap}.tar.bz2
 Source1:       %{name}-optimize-la.pl
@@ -60,11 +60,9 @@ Patch8:              %{name}-pr20218.patch
 
 # PRs
 Patch10:       %{name}-pr7776.patch
-Patch11:       %{name}-pr20297.patch
-Patch12:       %{name}-pr19606.patch
-Patch13:       %{name}-pr24879.patch
-#Patch14:      %{name}-x87-mmx-switch.patch    NEEDS UPDATE
-#Patch15:      %{name}-x87-mmx-eh.patch        NEEDS UPDATE
+Patch11:       %{name}-pr19606.patch
+Patch12:       %{name}-pr24879.patch
+Patch13:       %{name}-pr26435-pr20256.patch
 
 Patch17:       %{name}-pr19505.patch
 Patch18:       %{name}-pr24419.patch
@@ -73,7 +71,7 @@ Patch20:      %{name}-pr17390.patch
 Patch21:       %{name}-pr13676.patch
 Patch22:       %{name}-pr25626.patch
 Patch23:       %{name}-libstdcxx-bitset.patch
-Patch24:       %{name}-unexpected_eof.patch
+
 Patch25:       %{name}-libjava-multilib.patch
 Patch26:       %{name}-ppc64-m32-m64-multilib-only.patch
 Patch27:       %{name}-enable-java-awt-qt.patch
@@ -98,8 +96,8 @@ BuildRequires:        gcc(ada)
 BuildRequires: gcc-ada
 %endif
 BuildRequires: gettext-devel
+BuildRequires: glibc-devel >= 6:2.4-1
 %if %{with multilib}
-BuildRequires: glibc-devel >= 6:2.3.4-1.5
 %ifarch %{x8664}
 BuildRequires: glibc-devel(i686)
 %endif
@@ -112,8 +110,6 @@ BuildRequires:      glibc-devel(s390)
 %ifarch sparc64
 BuildRequires: glibc-devel(sparc)
 %endif
-%else
-BuildRequires: glibc-devel >= 2.2.5-20
 %endif
 BuildRequires: perl-devel
 BuildRequires: rpmbuild(macros) >= 1.211
@@ -121,7 +117,7 @@ BuildRequires:      texinfo >= 4.1
 BuildRequires: zlib-devel
 %if %{with fortran}
 BuildRequires: gmp-devel
-BuildRequires: libmpfr-devel
+BuildRequires: mpfr-devel
 %endif
 %if %{with java}
 BuildRequires: QtGui-devel >= 4.0.1
@@ -760,8 +756,8 @@ Bibliotecas est
 Statyczne biblioteki Obiektowego C.
 
 %prep
-%setup -q -n gcc-%{version}
-#setup -q -n gcc-%{version}-%{_snap}
+#setup -q -n gcc-%{version}
+%setup -q -n gcc-%{version}-%{_snap}
 #setup -q -n gcc-4_1-branch
 
 %patch0 -p1
@@ -778,14 +774,9 @@ Statyczne biblioteki Obiektowego C.
 
 # PRs
 %patch10 -p1
-%patch11 -p1
+%patch11 -p0
 %patch12 -p0
-%patch13 -p0
-
-%ifarch %{ix86} %{x8664}
-#patch14 -p1
-#patch15 -p1
-%endif
+%patch13 -p1
 
 %patch17 -p1
 %patch18 -p1
@@ -794,7 +785,7 @@ Statyczne biblioteki Obiektowego C.
 %patch21 -p1
 %patch22 -p1
 %patch23 -p1
-%patch24 -p1
+
 %patch25 -p1
 %patch26 -p1
 %patch27 -p1
@@ -860,7 +851,7 @@ TEXCONFIG=false \
        --with-gxx-include-dir=%{_includedir}/c++/%{version} \
        --disable-libstdcxx-pch \
        --enable-__cxa_atexit \
-       --enable-libstdcxx-allocator=mt \
+       --enable-libstdcxx-allocator=new \
 %endif
 %if %{with java}
        --with-qt4dir=%{_libdir}/qt4 \
@@ -1054,7 +1045,8 @@ rm -rf $RPM_BUILD_ROOT
 %files -f gcc.lang
 %defattr(644,root,root,755)
 %doc ChangeLog.general MAINTAINERS NEWS
-%doc gcc/{ChangeLog,ONEWS,README.Portability} bugs.html faq.html
+# bugs.html faq.html
+%doc gcc/{ChangeLog,ONEWS,README.Portability}
 %dir %{_libdir}/gcc
 %dir %{_libdir}/gcc/*
 %dir %{_libdir}/gcc/*/*