- starting 4.1.x, nfy.

Changed files:
    gcc4.spec -> 1.309

diff --git a/gcc4.spec b/gcc4.spec
index 555b890a8dbe0693c649188fbd56f319debc424b..82c8934379a05c85910577340362e975f7b0437d 100644 (file)
--- a/gcc4.spec
+++ b/gcc4.spec
@@ -9,11 +9,16 @@
 %bcond_without ada             # build without ADA support
 %bcond_without fortran         # build without Fortran support
 %bcond_without java            # build without Java support
-%bcond_without objc            # build without ObjC support
+%bcond_without objc            # build without Objective-C support
+%bcond_without objcxx          # build without Objective-C++ support
 %bcond_with    multilib        # build with multilib support (it needs glibc[32&64]-devel)
 %bcond_without profiling       # build without profiling
 %bcond_without bootstrap       # omit 3-stage bootstrap
 
+%if !%{with objc}
+%undefine      with_objcxx
+%endif
+
 %ifnarch %{x8664} ppc64 s390x sparc64
 %undefine      with_multilib
 %endif
@@ -23,15 +28,15 @@ 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.0.1
-%define                _snap   20050521
-Release:       0.%{_snap}.2
+Version:       4.1.0
+%define                _snap   20050522
+Release:       0.%{_snap}.0.1
 Epoch:         5
 License:       GPL v2+
 Group:         Development/Languages
 #Source0:      ftp://gcc.gnu.org/pub/gcc/releases/gcc-%{version}/%{name}-%{version}.tar.bz2
-Source0:       ftp://gcc.gnu.org/pub/gcc/snapshots/4.0-%{_snap}/gcc-4.0-%{_snap}.tar.bz2
-# Source0-md5: 7f45e29a00590ce57a001a9294e8184e
+Source0:       ftp://gcc.gnu.org/pub/gcc/snapshots/4.1-%{_snap}/gcc-4.1-%{_snap}.tar.bz2
+# Source0-md5: 6f5c5caac73493ea36f33ba1e2bf89d5
 Source1:       %{name}-optimize-la.pl
 Patch0:                %{name}-info.patch
 Patch1:                %{name}-nolocalefiles.patch
@@ -40,7 +45,6 @@ Patch3:               %{name}-ada-link-new-libgnat.patch
 Patch4:                %{name}-ada-link.patch
 Patch5:                %{name}-alpha-ada_fix.patch
 # PRs
-Patch10:       %{name}-pr19664.patch
 Patch11:       %{name}-pr20218.patch
 Patch12:       %{name}-pr20297.patch
 Patch14:       %{name}-push-pop-visibility.patch
@@ -676,7 +680,7 @@ Statyczne biblioteki Obiektowego C.
 
 %prep
 #setup -q -n gcc-%{version}
-%setup -q -n gcc-4.0-%{_snap}
+%setup -q -n gcc-4.1-%{_snap}
 
 %patch0 -p1
 %patch1 -p1
@@ -686,7 +690,6 @@ Statyczne biblioteki Obiektowego C.
 %patch5 -p1
 
 # PRs
-%patch10 -p1
 %patch11 -p0
 %patch12 -p1
 %patch14 -p0
@@ -720,7 +723,7 @@ TEXCONFIG=false \
        --enable-shared \
        --enable-threads=posix \
        --enable-__cxa_atexit \
-       --enable-languages="c,c++%{?with_fortran:,f95}%{?with_objc:,objc}%{?with_ada:,ada}%{?with_java:,java}" \
+       --enable-languages="c,c++%{?with_fortran:,f95}%{?with_objc:,objc}%{?with_objcxx:,obj-c++}%{?with_ada:,ada}%{?with_java:,java}" \
        --enable-c99 \
        --enable-long-long \
        --%{?with_multilib:en}%{!?with_multilib:dis}able-multilib \