X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=gcc.spec;h=49739db6a4e323d059e2bf347e51d6505b3403f1;hb=2c24b2679530117a6f696e976d44476d9c1447e8;hp=2330ecb695aa8f150e9ad698ece249619bbe0e82;hpb=264628c78371f33c60557725879e333c6fbfa47b;p=packages%2Fgcc.git

diff --git a/gcc.spec b/gcc.spec
index 2330ecb..49739db 100644
--- a/gcc.spec
+++ b/gcc.spec
@@ -1,47 +1,90 @@
-%define		STDC_VERSION 2.10.0
-%define		GCJ_VERSION 2.95.1
+#
+# Conditional build:
+# _without_ada  - build without ADA support
+# _without_java - build without Java support
+# _without_objc - build without objc support
+#
+%define		DASHED_SNAP	%{nil}
+%define		SNAP		%(echo %{DASHED_SNAP} | sed -e "s#-##g")
+%define		GCC_VERSION	3.2.2
+%define		KSI_VERSION	pre55
+%define		EPOCH		5
+
 Summary:	GNU Compiler Collection
 Summary(pl):	Kolekcja kompilatorów GNU
 Name:		gcc
-Version:	2.95.2
-Release:	5
+Version:	%{GCC_VERSION}
+Release:	0.2
+Epoch:		%{EPOCH}
 License:	GPL
 Group:		Development/Languages
-Group(pl):	Programowanie/Jêzyki
-Source0:	ftp://ftp.gnu.org/pub/gnu/gcc/%{name}-%{version}.tar.gz
-Source1:	ftp://sourceware.cygnus.com/pub/java/libgcj-%{GCJ_VERSION}.tar.gz
-Source2:	gcov.1
-Patch0:		gcc-info.patch
-Patch1:		gcc-libgcj-config.patch
-Patch2:		gcc-pld-linux.patch
-Patch3:		gcc-libstdc++.patch
-Patch4:		gcc-bootstrap.patch
-Patch5:		gcc-cpp-macro-doc.patch
-Patch6:		gcc-default-arch.patch
-Patch7:		gcc-cvs-updates.patch
-Patch8:		gcc-alpha-ev5-fix.patch
-Patch9:		gcc-libstdc++-out-of-mem.patch
-Patch10:	gcc-libstdc++-valarray.patch
-Patch11:	gcc-libstdc++-wstring.patch
-Patch12:	gcc-libstdc++-wall3.patch
-Patch13:	gcc-libstdc++-bastring.patch
-Patch14:	gcc-manpage.patch
-Patch15:	gcc-cpp-dos-newlines.patch
-Patch16:	gcc-g++-is-tree.patch
-Patch17:	gcc-gpc.patch
-Patch18:	gcc-arm-config.patch
-Patch19:	gcc-m68k-pic.patch
-Patch20:	gcc-sparc32-rfi.patch
-Patch21:	gcc-builtin-apply.patch
-Patch22:	gcc-ppc-ice.patch
-Patch23:	gcc-ppc-descriptions.patch
-Patch24:	gcc-ppc-andrew-dwarf-eh.patch
-Requires:	binutils >= 2.9.1.0.25
-Requires:	cpp = %{version}
-Obsoletes:	egcs
-Prereq:		/usr/sbin/fix-info-dir
+Source0:	ftp://gcc.gnu.org/pub/gcc/releases/gcc-%{GCC_VERSION}/%{name}-%{GCC_VERSION}.tar.bz2
+Source1:	ftp://ftp.pld.org.pl/people/malekith/ksi/ksi-%{KSI_VERSION}.tar.gz
+Source2:	%{name}-non-english-man-pages.tar.bz2
+Patch0:		%{name}-slibdir.patch
+Patch1:		%{name}-paths.patch
+Patch2:		%{name}-ada-no-addr2line.patch
+Patch3:		%{name}-ada-no-prefix.o.patch
+Patch4:		%{name}-nolocalefiles.patch
+Patch5:		%{name}-gcc-page.c.patch
+Patch6:		%{name}-info.patch
+# -- stolen patches from RH --
+Patch10:	gcc32-ada-link.patch
+Patch11:	gcc32-attr-visibility.patch
+Patch12:	gcc32-attr-visibility2.patch
+Patch13:	gcc32-attr-visibility3.patch
+Patch14:	gcc32-attr-visibility4.patch
+Patch15:	gcc32-attr-visibility5.patch
+Patch16:	gcc32-boehm-gc-libs.patch
+Patch17:	gcc32-bogus-inline.patch
+Patch18:	gcc32-c++-nrv-test.patch
+Patch19:	gcc32-c++-pretty_function.patch
+Patch20:	gcc32-c++-tsubst-asm.patch
+Patch21:	gcc32-cfg-eh.patch
+Patch22:	gcc32-debug-pr7241.patch
+
+Patch24:	gcc32-duplicate-decl.patch
+Patch25:	gcc32-dwarf2-pr6381.patch
+Patch26:	gcc32-dwarf2-pr6436-test.patch
+Patch27:	gcc32-fde-merge-compat.patch
+
+Patch29:	gcc32-hard-reg-sharing.patch
+Patch30:	gcc32-hard-reg-sharing2.patch
+Patch31:	gcc32-i386-default-momit-leaf-frame-pointer.patch
+Patch32:	gcc32-i386-memtest-test.patch
+Patch33:	gcc32-i386-no-default-momit-leaf-frame-pointer.patch
+Patch34:	gcc32-i386-pic-label-thunk.patch
+Patch35:	gcc32-i386-profile-olfp.patch
+Patch36:	gcc32-inline-label.patch
+Patch37:	gcc32-java-no-rpath.patch
+Patch38:	gcc32-pr6842.patch
+Patch39:	gcc32-sparc-sll1.patch
+Patch40:	gcc32-test-rh65771.patch
+Patch41:	gcc32-test-rotate.patch
+Patch42:	gcc32-tls-dwarf2.patch
+Patch43:	gcc32-tls.patch
+Patch44:	gcc32-tls2.patch
+Patch45:	gcc32-tls3.patch
+Patch46:	gcc32-tls4.patch
+Patch47:	gcc32-tls5.patch
+BuildRequires:	autoconf
+BuildRequires:	bison
+BuildRequires:	fileutils >= 4.0.41
+BuildRequires:	gcc
+%{!?_without_ada:BuildRequires:	gcc-ada}
+BuildRequires:	glibc-devel >= 2.2.5-20
+BuildRequires:	perl-devel
+BuildRequires:	texinfo >= 4.1
+BuildRequires:	zlib-devel
+BuildRequires:	gettext-devel
+Requires:	binutils >= 2.12.90.0.4
+Requires:	cpp = %{GCC_VERSION}
+Requires:	libgcc = %{GCC_VERSION}
+Conflicts:	glibc-devel < 2.2.5-20
 URL:		http://gcc.gnu.org/
-BuildRoot:	/tmp/%{name}-%{version}-root
+BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+
+%define		_slibdir	/lib
 
 %description
 A compiler aimed at integrating all the optimizations and features
@@ -51,535 +94,873 @@ necessary for a high-performance and stable development environment.
 Kompilator, posiadaj±cy du¿e mo¿liwo¶ci optymalizacyjne niezbêdne do
 wyprodukowania szybkiego i stablinego kodu wynikowego.
 
+%package -n libgcc
+Summary:	Shared gcc library
+Summary(pl):	Biblioteka gcc
+Group:		Libraries
+Version:        %{GCC_VERSION}
+
+%description -n libgcc
+Shared gcc library.
+
+%description -n libgcc -l pl
+Biblioteka dynamiczna gcc.
+
 %package c++
 Summary:	C++ support for gcc
-Summary(fr):	Support C++ pour le compilateur gcc
-Summary(pl):	Wspomaganie C++ dla kompilatora gcc
-Summary(tr):	gcc için C++ desteði
+Summary(pl):	Obs³uga C++ dla gcc
 Group:		Development/Languages
-Group(pl):	Programowanie/Jêzyki
 Obsoletes:	egcc-c++
 Obsoletes:	egcs-c++
+Requires:	gcc = %{GCC_VERSION}
 
 %description c++
-This package adds C++ support to the GNU C compiler. It includes support
-for most of the current C++ specification, including templates and
-exception handling. It does not include a standard C++ library, which is
-available separately.
+This package adds C++ support to the GNU C compiler. It includes
+support for most of the current C++ specification, including templates
+and exception handling. It does not include a standard C++ library,
+which is available separately.
 
-%description -l de c++
+%description c++ -l de
 Dieses Paket enthält die C++-Unterstützung für den GNU-C-Compiler. Es
 unterstützt die aktuelle C++-Spezifikation, inkl. Templates und
-Ausnahmeverarbeitung. Eine C++-Standard-Library ist nicht enthalten - sie
-ist getrennt erhältlich.
+Ausnahmeverarbeitung. Eine C++-Standard-Library ist nicht enthalten -
+sie ist getrennt erhältlich.
 
-%description -l fr c++
+%description c++ -l fr
 Ce package ajoute un support C++ au compilateur c GNU. Il comprend un
 support pour la plupart des spécifications actuelles de C++, dont les
-modéles et la gestion des exceptions. Il ne comprend pas une bibliothéque
-C++ standard, qui est disponible séparément.
+modéles et la gestion des exceptions. Il ne comprend pas une
+bibliothéque C++ standard, qui est disponible séparément.
 
-%description -l pl c++
-Programy z tego pakietu zapewniaj± wsparcie dla C++ do gcc. Posiada
-wspomaganie dla du¿ej ilo¶ci obecnych specyfikacji C++, nie posiada
-natomiast standardowych bibliotek C++, które s± w oddzielnym pakiecie.
+%description c++ -l pl
+Ten pakiet dodaje obs³ugê C++ do kompilatora gcc. Ma wsparcie dla
+du¿ej ilo¶ci obecnych specyfikacji C++, nie zawiera natomiast
+standardowych bibliotek C++, które s± w oddzielnym pakiecie.
 
-%description -l tr c++
-Bu paket, GNU C derleyicisine C++ desteði ekler. 'Template'ler ve aykýrý
-durum iþleme gibi çoðu güncel C++ tanýmlarýna uyar. Standart C++ kitaplýðý
-bu pakette yer almaz.
+%description c++ -l tr
+Bu paket, GNU C derleyicisine C++ desteði ekler. 'Template'ler ve
+aykýrý durum iþleme gibi çoðu güncel C++ tanýmlarýna uyar. Standart
+C++ kitaplýðý bu pakette yer almaz.
 
 %package objc
 Summary:	Objective C support for gcc
 Summary(de):	Objektive C-Unterstützung für gcc
 Summary(fr):	Gestion d'Objective C pour gcc
-Summary(pl):	Wspomaganie obiektowego C dla kompilatora gcc
+Summary(pl):	Obs³uga obiektowego C dla kompilatora gcc
 Summary(tr):	gcc için Objective C desteði
 Group:		Development/Languages
-Group(pl):	Programowanie/Jêzyki
 Obsoletes:	egcc-objc
 Obsoletes:	egcs-objc
+Requires:	libobjc = %{GCC_VERSION}
+Requires:	gcc = %{GCC_VERSION}
 
 %description objc
-This package adds Objective C support to the GNU C compiler. Objective C is
-a object oriented derivative of the C language, mainly used on systems
-running NeXTSTEP. This package does not include the standard objective C
-object library.
+This package adds Objective C support to the GNU C compiler. Objective
+C is a object oriented derivative of the C language, mainly used on
+systems running NeXTSTEP. This package does not include the standard
+objective C object library.
 
-%description -l de objc
+%description objc -l de
 Dieses Paket ergänzt den GNU-C-Compiler durch Objective-C-Support.
-Objective C ist ein objektorientiertes Derivat von C, das zur Hauptsache
-auf Systemen mit NeXTSTEP zum Einsatz kommt. Die
+Objective C ist ein objektorientiertes Derivat von C, das zur
+Hauptsache auf Systemen mit NeXTSTEP zum Einsatz kommt. Die
 Standard-Objective-C-Objekt-Library ist nicht Teil des Pakets.
 
-%description -l fr objc
-Ce package ajoute un support Objective C au compilateur C GNU. L'Objective C
-est un langage orienté objetdérivé du langage C, principalement utilisé sur
-les systèmes NeXTSTEP. Ce package n'inclue pas la bibliothéque Objective C
-standard.
+%description objc -l fr
+Ce package ajoute un support Objective C au compilateur C GNU.
+L'Objective C est un langage orienté objetdérivé du langage C,
+principalement utilisé sur les systèmes NeXTSTEP. Ce package n'inclue
+pas la bibliothéque Objective C standard.
+
+%description objc -l pl
+Ten pakiet dodaje obs³ugê obiektowego C do kompilatora gcc. Obiektowe
+C (objc) jest zorientowan± obiektowo pochodn± jêzyka C, u¿ywan±
+g³ównie w systemach u¿ywaj±cych NeXTSTEP. W pakiecie nie ma
+standardowej biblioteki objc (która znajduje siê w osobnym pakiecie).
+
+%description objc -l tr
+Bu paket, GNU C derleyicisine Objective C desteði ekler. Objective C,
+C dilinin nesne yönelik bir türevidir ve NeXTSTEP altýnda çalýþan
+sistemlerde yaygýn olarak kullanýlýr. Standart Objective C nesne
+kitaplýðý bu pakette yer almaz.
+
+%package -n libobjc
+Summary:	Objective C Libraries
+Summary(pl):	Biblioteki Obiektowego C
+Group:		Libraries
+Version:	%{GCC_VERSION}
+
+%description -n libobjc
+Objective C Libraries.
+
+%description -n libobjc -l pl
+Biblioteki Obiektowego C.
 
-%description -l pl objc
-Ten pakiet jest wsparciem obiektowego C dla kompilatora gcc.  W pakiecie nie
-ma jeszcze bibliotek C-obj.
+%package -n libobjc-static
+Summary:	Static Objective C Libraries
+Summary(pl):	Statyczne Biblioteki Obiektowego C
+Group:		Development/Libraries
+Version:	%{GCC_VERSION}
+Requires:	libobjc = %{GCC_VERSION}
+
+%description -n libobjc-static
+Static Objective C Libraries.
 
-%description -l tr objc
-Bu paket, GNU C derleyicisine Objective C desteði ekler. Objective C, C
-dilinin nesne yönelik bir türevidir ve NeXTSTEP altýnda çalýþan sistemlerde
-yaygýn olarak kullanýlýr. Standart Objective C nesne kitaplýðý bu pakette
-yer almaz.
+%description -n libobjc-static -l pl
+Statyczne biblioteki Obiektowego C.
 
 %package g77
 Summary:	Fortran 77 support for gcc
-Summary(pl):	Wspomaganie Fortran 77 dla gcc
+Summary(pl):	Obs³uga Fortranu 77 dla gcc
 Group:		Development/Languages
-Group(pl):	Programowanie/Jêzyki
-Prereq:		/usr/sbin/fix-info-dir
+Version:	%{GCC_VERSION}
 Obsoletes:	egcs-g77
+Requires:	libg2c = %{GCC_VERSION}
 
 %description g77
-This apckage adds support for compiling Fortran 77 programs with the GNU
-compiler.
+This apckage adds support for compiling Fortran 77 programs with the
+GNU compiler.
 
-%description -l pl g77
-Ten pakiet jest wsparciem Fortran 77 dla kompilatora gcc.
-Jest potrzebny do kompilowania programów pisanych w jêzyku Fortran 77.
+%description g77 -l pl
+Ten pakiet dodaje obs³ugê Fortranu 77 do kompilatora gcc. Jest
+potrzebny do kompilowania programów pisanych w jêzyku Fortran 77.
 
-%package chill
-Summary:	CHILL support for gcc
-Summary(pl):	Wspomoganie CHILL dla gcc
-Group:		Development/Languages
-Group(pl):	Programowanie/Jêzyki
-Requires:	%{name} = %{version}
-Prereq:		/usr/sbin/fix-info-dir
+%package -n libg2c
+Summary:	Fortran 77 Libraries
+Summary(pl):	Biblioteki Fortranu 77
+Group:		Libraries
+Version:        %{GCC_VERSION}
+
+%description -n libg2c
+Fortran 77 Libraries.
+
+%description -n libg2c -l pl
+Biblioteki Fortranu 77.
+
+%package -n libg2c-static
+Summary:	Static Fortran 77 Libraries
+Summary(pl):	Statyczne Biblioteki Fortranu 77
+Group:		Development/Libraries
+Version:        %{GCC_VERSION}
+Requires:	libg2c = %{GCC_VERSION}
 
-%description chill
-This package adds support for compiling CHILL programs with the GNU
-compiler.
+%description -n libg2c-static
+Static Fortran 77 Libraries.
 
-Chill is the "CCITT High-Level Language", where CCITT is the old
-name for what is now ITU, the International Telecommunications Union.
-It is is language in the Modula2 family, and targets many of the
-same applications as Ada (especially large embedded systems).
-Chill was never used much in the United States, but is still
-being used in Europe, Brazil, Korea, and other places.
+%description -n libg2c-static -l pl
+Statyczne biblioteki Fortranu 77.
 
 %package java
 Summary:	Java support for gcc
-Summary(pl):	Wspomoganie Java dla gcc
+Summary(pl):	Obs³uga Javy dla gcc
 Group:		Development/Languages
-Group(pl):	Programowanie/Jêzyki
+Version:        %{GCC_VERSION}
 Requires:	%{name} = %{version}
-Requires:	%{name}-libgcj = %{version}
+Requires:	libgcj >= 3.0.0
+Requires:	libgcj-devel >= 3.0.0
+Provides:	gcj = %{epoch}:%{GCC_VERSION}-%{release}
+Provides:	jar = %{epoch}:%{GCC_VERSION}-%{release}
+Obsoletes:	fastjar
 
 %description java
-This package adds experimental support for compiling Java(tm) programs and
-bytecode into native code. To use this you will also need the gcc-libgcj
-package.
-
-%package libgcj
-Summary:	Java runtime library for gcc
+This package adds experimental support for compiling Java(tm) programs
+and bytecode into native code. To use this you will also need the
+libgcj package.
+
+%description -l pl java
+Wsparcie dla kompilowania programów Java(tm) zrówno do bajt-kodu jak i
+do natywnego kodu. Dodatkowo wymagany jest pakiet libgcj, aby mo¿na
+by³o przeprowadziæ kompilacjê.
+
+%package -n libgcj
+Summary:	Java Class Libraries
+Summary(pl):	Biblioteki Klas Javy
 Group:		Libraries
-URL:		http://sourceware.cygnus.com/java/
-Requires:	zip >= 2.1
+Version:	%{GCC_VERSION}
+Requires:	zlib
+
+%description -n libgcj
+Java Class Libraries.
 
-%description libgcj
-The Java runtime library. You will need this package to compile your Java
-programs using the gcc Java compiler (gcj).
+%description -n libgcj -l pl
+Biblioteki Klas Javy.
 
-%package libgcj-static
-Summary:	Static java runtime library for gcc
+%package -n libgcj-devel
+Summary:	Development files for Java Class Libraries
+Summary(pl):	Pliki nag³ówkowe dla Bibliotek Klas Javy
 Group:		Development/Libraries
-URL:		http://sourceware.cygnus.com/java/
-Requires:	%{name}-libgcj = %{version}
+Version:	%{GCC_VERSION}
+Requires:	libgcj = %{GCC_VERSION}
+Requires:	%{name}-java
+
+%description -n libgcj-devel
+Development files for Java Class Libraries.
 
-%description libgcj-static
-The static java runtime library. You will need this package to staticly
-compile your Java programs using the gcc Java compiler (gcj).
+%description -n libgcj-devel -l pl
+Pliki nag³ówkowe dla Bibliotek Klas Javy.
+
+%package -n libgcj-static
+Summary:	Static Java Class Libraries
+Summary(pl):	Statyczne Biblioteki Klas Javy
+Group:		Development/Libraries
+Version:	%{GCC_VERSION}
+Requires:	libstdc++-devel = %{GCC_VERSION}
+Requires:	libgcj-devel = %{GCC_VERSION}
+
+%description -n libgcj-static
+Static Java Class Libraries.
+
+%description -n libgcj-static -l pl
+Statyczne Biblioteki Klas Javy.
 
 %package -n libstdc++
 Summary:	GNU c++ library
-Summary(pl):	Biblioteki GNU C++ 
+Summary(pl):	Biblioteki GNU C++
 Group:		Libraries
-Group(pl):	Biblioteki
-Version:	%{STDC_VERSION}
+Version:	%{GCC_VERSION}
 Obsoletes:	libg++
 
 %description -n libstdc++
-This is the GNU implementation of the standard C++ libraries, along with
-additional GNU tools. This package includes the shared libraries
+This is the GNU implementation of the standard C++ libraries, along
+with additional GNU tools. This package includes the shared libraries
 necessary to run C++ applications.
 
-%description -l de -n libstdc++
-Dies ist die GNU-Implementierung der Standard-C++-Libraries mit weiteren
-GNU-Tools. Dieses Paket enthält die zum Ausführen von C++-Anwendungen
-erforderlichen gemeinsam genutzten Libraries.
+%description -n libstdc++ -l de
+Dies ist die GNU-Implementierung der Standard-C++-Libraries mit
+weiteren GNU-Tools. Dieses Paket enthält die zum Ausführen von
+C++-Anwendungen erforderlichen gemeinsam genutzten Libraries.
 
-%description -l fr -n libstdc++
-Ceci est l'implémentation GNU des librairies C++ standard, ainsi que des
-outils GNU supplémentaires. Ce package comprend les librairies partagées
-nécessaires à l'exécution d'application C++.
+%description -n libstdc++ -l fr
+Ceci est l'implémentation GNU des librairies C++ standard, ainsi que
+des outils GNU supplémentaires. Ce package comprend les librairies
+partagées nécessaires à l'exécution d'application C++.
 
-%description -l pl -n libstdc++  
-Pakiet ten zawiera biblioteki bêd±ce implementacj± standardowych bibliotek
-C++. Znajduj± siê w nim biblioteki dynamiczne niezbêdne do uruchomienia
-aplikacji napisanych w C++.
+%description -n libstdc++ -l pl
+Pakiet ten zawiera biblioteki bêd±ce implementacj± standardowych
+bibliotek C++. Znajduj± siê w nim biblioteki dynamiczne niezbêdne do
+uruchomienia aplikacji napisanych w C++.
 
-%description -l tr -n libstdc++
+%description -n libstdc++ -l tr
 Bu paket, standart C++ kitaplýklarýnýn GNU gerçeklemesidir ve C++
 uygulamalarýnýn koþturulmasý için gerekli kitaplýklarý içerir.
 
 %package -n libstdc++-devel
-Summary:	Header files and libraries for C++ development
-Summary(de):	Header-Dateien und Libraries zur Entwicklung mit C++
-Summary(fr):	Fichiers d'en-tête et biblitothèques pour développer en C++.
+Summary:	Header files and documentatino for C++ development
+Summary(de):	Header-Dateien zur Entwicklung mit C++
+Summary(fr):	Fichiers d'en-tête et biblitothèques pour développer en C++
+Summary(pl):	Pliki nag³ówkowe i dokumentacja do biblioteki standardowej C++
 Summary(tr):	C++ ile program geliþtirmek için gerekli dosyalar
 Group:		Development/Libraries
-Group(pl):	Programowanie/Biblioteki
-Version:	%{STDC_VERSION}
-Requires:	libstdc++ = %{STDC_VERSION}
+Version:	%{GCC_VERSION}
+Requires:	libstdc++ = %{GCC_VERSION}
 Requires:	%{name}-c++
 Obsoletes:	libg++-devel
 
 %description -n libstdc++-devel
-This is the GNU implementation of the standard C++ libraries.  This package
-includes the header files and libraries needed for C++ development.
+This is the GNU implementation of the standard C++ libraries. This
+package includes the header files needed for C++ development and
+library documentation.
 
-%description -l pl -n libstdc++-devel
-Pakiet ten zawiera biblioteki bêd±ce implementacj± standardowych bibliotek
-C++. Znajduj± siê w nim pliki nag³ówkowe wykorzystywane przy programowaniu
-w jêzyku C++.
+%description -n libstdc++-devel -l pl
+Pakiet ten zawiera biblioteki bêd±ce implementacj± standardowych
+bibliotek C++. Znajduj± siê w nim pliki nag³ówkowe wykorzystywane przy
+programowaniu w jêzyku C++ oraz dokumentacja biblioteki standardowej.
 
 %package -n libstdc++-static
-Summary:	Static c++ standard library
-Summary(pl):	Biblioeka statyczna c++
+Summary:	Static C++ standard library
+Summary(pl):	Statyczna biblioteka standardowa C++
 Group:		Development/Libraries
-Group(pl):	Programowanie/Biblioteki
-Version:	%{STDC_VERSION}
-Requires:	libstdc++-devel = %{STDC_VERSION}
+Version:	%{GCC_VERSION}
+Requires:	libstdc++-devel = %{GCC_VERSION}
 
 %description -n libstdc++-static
-Static c++ standard library.
+Static C++ standard library.
+
+%description -n libstdc++-static -l pl
+Statycza biblioteka standardowa C++.
+
+%package ada
+Summary:	Ada support for gcc
+Summary(pl):	Obs³uga Ady do gcc
+Group:		Development/Languages
+Version:        %{GCC_VERSION}
+Requires:	libgnat = %{GCC_VERSION}
+Requires:	gcc = %{GCC_VERSION}
+Obsoletes:	gcc-gnat
+Obsoletes:	gnat-devel
+
+%description ada
+This package adds experimental support for compiling Ada programs.
+
+%description -l pl ada
+Ten pakiet dodaje eksperymentalne wsparcie dla kompilacji programów
+w Adzie.
+
+%package -n libgnat
+Summary:	Ada standard libraries
+Summary(pl):	Biblioteki standardowe dla Ady
+Group:		Libraries
+Version:        %{GCC_VERSION}
+Obsoletes:	gnat
+
+%description -n libgnat
+This package contains shared libraries needed to run programs written
+in Ada.
+
+%description -n libgnat -l pl
+Ten pakiet zawiera biblioteki potrzebne do uruchamiania programów napisanych
+w Adzie.
+
+%package -n libgnat-static
+Summary:	Static Ada standard libraries
+Summary(pl):	Statyczne biblioteki standardowe dla Ady
+Group:		Libraries
+Version:        %{GCC_VERSION}
+Obsoletes:	gnat-static
+
+%description -n libgnat-static
+This package contains static libraries for programs written in Ada.
+
+%description -n libgnat-static -l pl
+Ten pakiet zawiera biblioteki statyczne dla programów napisanych w
+Adzie.
 
-%description -l pl -n libstdc++-static
-Biblioteka statyczna C++.
+%package ksi
+Summary:	Ksi support for gcc
+Summary(pl):	Obs³uga Ksi dla gcc
+Version:	%{GCC_VERSION}.%{KSI_VERSION}
+Group:		Development/Languages
+Requires:	gcc = %{GCC_VERSION}
+
+%description ksi
+This package adds experimental support for compiling Ksi programs
+into native code. You proabably don't need it, unless your are going
+to develop a compiler using Ksi as intermediate representation or
+you are using such compiler (like Gont).
+
+%description ksi -l pl
+Ten pakiet dodaje eksperymentalne wsparcie dla kompilacji programów
+w Ksi do kodu maszynowego. Prawdopodobnie nie potrzebujesz go, chyba
+¿e zamierzasz pisaæ kompilator u¿ywaj±cy Ksi jako reprezentacji
+po¶rednicz±cej, lub u¿ywasz takiego kompilatora (jak Gont).
 
 %package -n cpp
 Summary:	The C Pre Processor
 Summary(pl):	Preprocesor C
 Group:		Development/Languages
-Group(pl):	Programowanie/Jêzyki
-Prereq:		/usr/sbin/fix-info-dir
+Version:	%{GCC_VERSION}
 Obsoletes:	egcs-cpp
+Obsoletes:	gcc-cpp
 
 %description -n cpp
-The C preprocessor is a "macro processor" that is used automatically by the
-C compiler to transform your program before actual compilation. It is called
-a macro processor because it allows you to define "macros", which are brief
-abbreviations for longer constructs.
-
-The C preprocessor provides four separate facilities that you can use as you
-see fit:
-
-* Inclusion of header files.  These are files of declarations that
-  can be substituted into your program.
-* Macro expansion.  You can define "macros", which are abbreviations for
-  arbitrary fragments of C code, and then the C preprocessor will replace
-  the macros with their definitions throughout the program.
-* Conditional compilation.  Using special preprocessing directives,
-  you can include or exclude parts of the program according to various
+The C preprocessor is a "macro processor" that is used automatically
+by the C compiler to transform your program before actual compilation.
+It is called a macro processor because it allows you to define
+"macros", which are brief abbreviations for longer constructs.
+
+The C preprocessor provides four separate facilities that you can use
+as you see fit:
+
+- Inclusion of header files. These are files of declarations that can
+  be substituted into your program.
+- Macro expansion. You can define "macros", which are abbreviations
+  for arbitrary fragments of C code, and then the C preprocessor will
+  replace the macros with their definitions throughout the program.
+- Conditional compilation. Using special preprocessing directives, you
+  can include or exclude parts of the program according to various
   conditions.
-* Line control.  If you use a program to combine or rearrange source
-  files into an intermediate file which is then compiled, you can use line
-  control to inform the compiler of where each source line originally came
-  from.
-
-%description -l pl -n cpp
-Przeprocesor C jest "makro procesorem" który jest automatycznie u¿ywany
-przez kompilator C do obróbki kompilowanego programu przed w³a¶ciw±
-kompilacj±. Jest on nazywany makroprocesorem, poniewa¿ umo¿liwia
-definiowanie i rozwijanie makr umo¿liwiaj±cych skracanie d³ugich konstrukcji
-w jêzyku C.
+- Line control. If you use a program to combine or rearrange source
+  files into an intermediate file which is then compiled, you can use
+  line control to inform the compiler of where each source line
+  originally came from.
+
+%description -n cpp -l pl
+Przeprocesor C jest "makro procesorem" który jest automatycznie
+u¿ywany przez kompilator C do obróbki kompilowanego programu przed
+w³a¶ciw± kompilacj±. Jest on nazywany makroprocesorem, poniewa¿
+umo¿liwia definiowanie i rozwijanie makr umo¿liwiaj±cych skracanie
+d³ugich konstrukcji w jêzyku C.
 
 Preprocesor C umo¿liwia wykonywanie czterech ró¿nych typów operacji:
 
-* Do³±czanie plików (np. nag³ówkowych). Wstawia pliki w miejscu
+- Do³±czanie plików (np. nag³ówkowych). Wstawia pliki w miejscu
   deklaracji polecenia do³±czenia innego pliku.
-* Rozwijanie makr. Mo¿na definiowaæ "makra" nadaj±c im identyfikatory,
+- Rozwijanie makr. Mo¿na definiowaæ "makra" nadaj±c im identyfikatory,
   których pó¼niejsze u¿ycie powoduje podczas rozwijania podmienienie
   indentyfikatora deklarowan± wcze¶niej warto¶ci±.
-* Kompilacja warunkowa. W zale¿no¶ci od obecno¶ci symboli i dyrektyw w
-  ¶rodowisku preprocesora s± w³±czane warunkowo, b±d¼ nie, pewne fragmenty
-  obrabianego strumienia tekstów.
-* Kontrola linii ¼ród³a. Niezale¿nie od tego jakim przeobra¿eniom podlega
-  wynikowy strumieñ danych w wyniku rozwijania makr i do³±czania s±
-  zapamiêtywane informacje o tym, której linii pliku ¼ród³owego
+- Kompilacja warunkowa. W zale¿no¶ci od obecno¶ci symboli i dyrektyw w
+  ¶rodowisku preprocesora s± w³±czane warunkowo, b±d¼ nie, pewne
+  fragmenty obrabianego strumienia tekstów.
+- Kontrola linii ¼ród³a. Niezale¿nie od tego jakim przeobra¿eniom
+  podlega wynikowy strumieñ danych w wyniku rozwijania makr i do³±czania
+  s± zapamiêtywane informacje o tym, której linii pliku ¼ród³owego
   odpowiada fragment pliku wynikowego.
 
 %prep
-%setup -q
-%setup -q -a1 -D -T
-mv libgcj-%{GCJ_VERSION} libgcj
-mv libgcj/boehm-gc libgcj/libjava libgcj/zlib libgcj/zip .
+%setup -q -a1 -n %{name}-%{GCC_VERSION}
+mv ksi-%{KSI_VERSION} gcc/ksi
+
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
+#%patch3 -p1
 %patch4 -p1
-%patch5 -p0
-%patch6 -p0
-%patch7 -p1
-%patch8 -p0
-%patch9 -p0
-%patch10 -p0
-%patch11 -p0
-%patch12 -p0
-%patch13 -p0
-%patch14 -p0
-%patch15 -p0
-%patch16 -p1
-%patch17 -p1
-%patch18 -p0
-%patch19 -p0
-%patch20 -p0
-%patch21 -p0
-%patch22 -p0
-%patch23 -p0
-%patch24 -p0
+%patch5 -p1
+
+#%patch10
+%patch11
+%patch12
+%patch13
+%patch14
+%patch15
+#%patch16
+%patch17
+%patch18
+%patch19
+%patch20
+%patch21
+%patch22
+
+%patch24
+%patch25
+%patch26
+%patch27
+%patch29
+%patch30
+%patch31
+%patch32
+%patch33
+%patch34
+%patch35
+%patch36
+%patch37
+%patch38
+%patch39
+%patch40
+%patch41
+%patch42
+%patch43
+%patch44
+%patch45
+%patch46
+%patch47
+
+%patch6 -p1
+
+perl -p -i -e 's/";/ (PLD Linux)";/' gcc/version.c
 
 %build
-(cd gcc; autoconf)
-rm -rf obj-%{_target_platform}
-install -d obj-%{_target_platform} && cd obj-%{_target_platform} 
+# cd gcc && autoconf; cd ..
+# autoconf is not needed!
+rm -rf obj-%{_target_platform} && install -d obj-%{_target_platform} && cd obj-%{_target_platform}
 
-CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" LDFLAGS="-s" \
-../configure \
+CFLAGS="%{rpmcflags}" \
+CXXFLAGS="%{rpmcflags}" \
+TEXCONFIG=false ../configure \
 	--prefix=%{_prefix} \
 	--infodir=%{_infodir} \
+	--mandir=%{_mandir} \
 	--enable-shared \
-%ifnarch sparc sparc64
-	--enable-threads \
-	--enable-haifa \
-%endif
+	--enable-threads=posix \
+	--enable-__cxa_atexit \
+        --enable-languages="c,c++,f77,gcov%{?!_without_objc:,objc},ksi%{!?_without_ada:,ada}%{!?_without_java:,java}" \
+	--enable-c99 \
+	--enable-long-long \
+	--enable-multilib \
+	--enable-nls \
 	--with-gnu-as \
 	--with-gnu-ld \
-	--with-gxx-include-dir="\$\{prefix\}/include/g++" \
+	--with-system-zlib \
+	--with-slibdir=%{_slibdir} \
+	--without-x \
 	%{_target_platform}
 
 PATH=$PATH:/sbin:%{_sbindir}
-touch  ../gcc/c-gperf.h
 
-make LDFLAGS_FOR_TARGET="-s" \
+# this dirty hack is relict of setting, where objdir is subdir of srcdir
+%if %{!?_without_ada:1}%{?_without_ada:0}
+sed -e 's/srcdir=\$(fsrcdir)/srcdir=\$(fsrcdir) VPATH=\$(fsrcdir)/' \
+	gcc/ada/Makefile > makefile.tmp
+mv -f makefile.tmp gcc/ada/Makefile
+%endif
+
+cd ..
+%{__make} -C obj-%{_target_platform} bootstrap-lean \
+	LDFLAGS_FOR_TARGET="%{rpmldflags}" \
+	mandir=%{_mandir} \
+	infodir=%{_infodir}
+
+%if %{!?_without_ada:1}%{?_without_ada:0}
+%{__make} -C obj-%{_target_platform}/gcc gnatlib gnattools gnatlib-shared \
+	LDFLAGS_FOR_TARGET="%{rpmldflags}" \
 	mandir=%{_mandir} \
 	infodir=%{_infodir}
 
+# make Gnat Reference Manual
+%{__make} -C obj-%{_target_platform}/gcc/ada doc
+%endif
+
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_datadir}
+install -d $RPM_BUILD_ROOT{/lib,%{_datadir},%{_infodir}}
 
 cd obj-%{_target_platform}
 PATH=$PATH:/sbin:%{_sbindir}
 
-make install \
+%{__make} install \
 	prefix=$RPM_BUILD_ROOT%{_prefix} \
 	mandir=$RPM_BUILD_ROOT%{_mandir} \
-	infodir=$RPM_BUILD_ROOT%{_infodir}
+	infodir=$RPM_BUILD_ROOT%{_infodir} \
+	slibdir=$RPM_BUILD_ROOT/lib
 
-make install \
-	prefix=$RPM_BUILD_ROOT%{_prefix} \
-	mandir=$RPM_BUILD_ROOT%{_mandir} \
-	infodir=$RPM_BUILD_ROOT%{_infodir} -C texinfo
+ln -sf gcc $RPM_BUILD_ROOT%{_bindir}/cc
+echo .so gcc.1 > $RPM_BUILD_ROOT%{_mandir}/man1/cc.1
 
-strip $RPM_BUILD_ROOT%{_bindir}/* || :
+ln -sf g77 $RPM_BUILD_ROOT%{_bindir}/f77
+echo .so g77.1 > $RPM_BUILD_ROOT%{_mandir}/man1/f77.1
 
-strip $RPM_BUILD_ROOT%{_libdir}/gcc-lib/%{_target_cpu}*/*/{cc1,cc1chill,cc1obj,cc1plus,cpp,f771,collect2,jc1,jvgenmain}
-strip --strip-unneeded $RPM_BUILD_ROOT%{_libdir}/lib*.so*
+%if %{!?_without_ada:1}%{?_without_ada:0}
+# move ada shared libraries to proper place...
+mv $RPM_BUILD_ROOT%{_libdir}/gcc-lib/%{_target_cpu}*/*/adalib/*-*so \
+	$RPM_BUILD_ROOT%{_libdir}
+rm -f $RPM_BUILD_ROOT%{_libdir}/gcc-lib/%{_target_cpu}*/*/adalib/*.so
+(cd $RPM_BUILD_ROOT%{_libdir} && \
+ ln -s libgnat-*so libgnat.so.1   && ln -s libgnat-*so libgnat.so && \
+ ln -s libgnarl-*so libgnarl.so.1 && ln -s libgnarl-*so libgnarl.so)
+%endif
 
-ln -sf gcc $RPM_BUILD_ROOT%{_bindir}/cc
+ln -sf %{_bindir}/cpp $RPM_BUILD_ROOT/lib/cpp
 
-echo .so g77.1 > $RPM_BUILD_ROOT%{_mandir}/man1/f77.1
-echo .so cccp.1 > $RPM_BUILD_ROOT%{_mandir}/man1/cpp.1
-install %{SOURCE2} $RPM_BUILD_ROOT%{_mandir}/man1/
+cd ..
 
-ln -sf g77 $RPM_BUILD_ROOT%{_bindir}/f77
+%if %{!?_without_ada:1}%{?_without_ada:0}
+install obj-%{_target_platform}/gcc/ada/gnat_rm.info* $RPM_BUILD_ROOT%{_infodir}
+install obj-%{_target_platform}/gcc/ada/gnat_ug_unx.info* $RPM_BUILD_ROOT%{_infodir}
+%endif
 
-(cd $RPM_BUILD_ROOT%{_libdir} ; ln -sf libstdc++.so.*.*.* $RPM_BUILD_ROOT%{_libdir}/libstdc++.so)
+%if %{!?_without_java:1}%{?_without_java:0}
+install -d java-doc
+cp -f libjava/doc/cni.sgml libjava/READ* java-doc
+cp -f fastjar/README java-doc/README.fastjar
+cp -f libffi/README java-doc/README.libffi
+cp -f libffi/LICENSE java-doc/LICENSE.libffi
+%endif
 
-install -d $RPM_BUILD_ROOT/lib
-(cd $RPM_BUILD_ROOT; \
-ln -sf ../`dirname usr/lib/gcc-lib/%{_target_cpu}*/*/cpp`/cpp $RPM_BUILD_ROOT/lib/cpp)
+%if %{?!_without_objc:1}0
+cp -f libobjc/README gcc/objc/README.libobjc
+%endif
+
+# avoid -L poisoning in *.la - there should be only -L%{_libdir}/gcc-lib/*/%{version}
+for f in libstdc++.la %{!?_without_java:libgcj.la} ; do
+	perl -pi -e 's@-L[^ ]*[acs.] @@g' $RPM_BUILD_ROOT%{_libdir}/$f
+done
 
-gzip -9nf $RPM_BUILD_ROOT%{_datadir}/{info/*.info*,man/man1/*} \
-	  ../READ* ../ChangeLog ../gcc/ch/chill.brochure
+bzip2 -dc %{SOURCE2} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
+mv -f $RPM_BUILD_ROOT%{_mandir}/ja/man1/{cccp,cpp}.1
+
+%find_lang %{name}
+%find_lang libstdc\+\+
+
+%clean
+rm -rf $RPM_BUILD_ROOT
 
 %post
-/usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
+[ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
 
 %postun
-/usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
+[ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
 
 %post g77
-/usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
+[ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
 
 %postun g77
-/usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
+[ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
+
+%post java
+[ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
+
+%postun java
+[ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
 
-%post chill
-/usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
+%post ksi
+[ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
 
-%postun chill
-/usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
+%postun ksi
+[ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
 
 %post -n cpp
-/usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
+[ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
 
 %postun -n cpp
-/usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
-
-%post libgcj  -p /sbin/ldconfig
+[ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
 
+%post   -p /sbin/ldconfig -n libgcc
+%postun -p /sbin/ldconfig -n libgcc
 %post   -p /sbin/ldconfig -n libstdc++
 %postun -p /sbin/ldconfig -n libstdc++
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%files
+%post   -p /sbin/ldconfig -n libobjc
+%postun -p /sbin/ldconfig -n libobjc
+%post   -p /sbin/ldconfig -n libg2c
+%postun -p /sbin/ldconfig -n libg2c
+%post   -p /sbin/ldconfig -n libgcj
+%postun -p /sbin/ldconfig -n libgcj
+%post   -p /sbin/ldconfig -n libgnat
+%postun -p /sbin/ldconfig -n libgnat
+
+%files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc READ* ChangeLog.gz
-
+%doc READ* ChangeLog
 %dir %{_libdir}/gcc-lib
 %dir %{_libdir}/gcc-lib/%{_target_cpu}*
 %dir %{_libdir}/gcc-lib/%{_target_cpu}*/*
 %dir %{_libdir}/gcc-lib/%{_target_cpu}*/*/include
-
 %attr(755,root,root) %{_bindir}/%{_target_cpu}*-gcc
 %attr(755,root,root) %{_bindir}/gcc
+%attr(755,root,root) %{_bindir}/gccbug
 %attr(755,root,root) %{_bindir}/gcov
-%attr(755,root,root) %{_bindir}/protoize
-%attr(755,root,root) %{_bindir}/unprotoize
 %attr(755,root,root) %{_bindir}/cc
 
 %{_mandir}/man1/gcc.1*
+%{_mandir}/man1/cc.1*
 %{_mandir}/man1/gcov.1*
+%lang(fr) %{_mandir}/fr/man1/gcc.1*
+%lang(ja) %{_mandir}/ja/man1/gcc.1*
 %{_infodir}/gcc*
 
-%{_libdir}/gcc-lib/%{_target_cpu}*/*/SYSCALLS.c.X
-%attr(755,root,root) %{_libdir}/gcc-lib/%{_target_cpu}*/*/cc1
 %{_libdir}/gcc-lib/%{_target_cpu}*/*/libgcc.a
-%{_libdir}/gcc-lib/%{_target_cpu}*/*/lib*.map
+%{_libdir}/gcc-lib/%{_target_cpu}*/*/libgcc_eh.a
 %{_libdir}/gcc-lib/%{_target_cpu}*/*/specs
-
-%ifnarch alpha
-%attr(755,root,root) %{_libdir}/gcc-lib/%{_target_cpu}*/*/crt*.o
+%attr(644,root,root) %{_libdir}/gcc-lib/%{_target_cpu}*/*/crt*.o
+%ifarch ppc
+%attr(644,root,root) %{_libdir}/gcc-lib/%{_target_cpu}*/*/ecrt*.o
+%attr(644,root,root) %{_libdir}/gcc-lib/%{_target_cpu}*/*/ncrt*.o
+%{_libdir}/gcc-lib/%{_target_cpu}*/*/nof
+%dir %{_libdir}/nof
 %endif
-
+%attr(755,root,root) %{_libdir}/gcc-lib/%{_target_cpu}*/*/cc1
 %attr(755,root,root) %{_libdir}/gcc-lib/%{_target_cpu}*/*/collect2
 
 %{_libdir}/gcc-lib/%{_target_cpu}*/*/include/float.h
 %{_libdir}/gcc-lib/%{_target_cpu}*/*/include/iso646.h
 %{_libdir}/gcc-lib/%{_target_cpu}*/*/include/limits.h
-%{_libdir}/gcc-lib/%{_target_cpu}*/*/include/proto.h
 %{_libdir}/gcc-lib/%{_target_cpu}*/*/include/stdarg.h
 %{_libdir}/gcc-lib/%{_target_cpu}*/*/include/stdbool.h
 %{_libdir}/gcc-lib/%{_target_cpu}*/*/include/stddef.h
 %{_libdir}/gcc-lib/%{_target_cpu}*/*/include/syslimits.h
-%{_libdir}/gcc-lib/%{_target_cpu}*/*/include/va-*.h
 %{_libdir}/gcc-lib/%{_target_cpu}*/*/include/varargs.h
+%ifarch %{ix86}
+%{_libdir}/gcc-lib/%{_target_cpu}*/*/include/mmintrin.h
+%{_libdir}/gcc-lib/%{_target_cpu}*/*/include/xmmintrin.h
+%endif
+%ifarch ppc
+%{_libdir}/gcc-lib/%{_target_cpu}*/*/include/altivec.h
+%{_libdir}/gcc-lib/%{_target_cpu}*/*/include/ppc-asm.h
+%endif
 
-%files c++
+%files -n libgcc
 %defattr(644,root,root,755)
+%attr(755,root,root) %{_slibdir}/lib*.so*
 
-%{_mandir}/man1/g++.1.gz
-
+%files c++
+%defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/g++
+%attr(755,root,root) %{_bindir}/%{_target_cpu}*-g++
 %attr(755,root,root) %{_bindir}/c++
+%attr(755,root,root) %{_bindir}/%{_target_cpu}*-c++
 %attr(755,root,root) %{_bindir}/c++filt
 %attr(755,root,root) %{_libdir}/gcc-lib/%{_target_cpu}*/*/cc1plus
+%{_libdir}/libsupc++.la
+%ifarch ppc
+%{_libdir}/nof/libsupc++.la
+%{_libdir}/nof/libsupc++.a
+%endif
+%{_libdir}/libsupc++.a
+%{_mandir}/man1/g++.1*
+%lang(es) %{_mandir}/es/man1/c++filt.1*
+%lang(ja) %{_mandir}/ja/man1/g++.1*
 
-%{_libdir}/gcc-lib/%{_target_cpu}*/*/include/exception
-%{_libdir}/gcc-lib/%{_target_cpu}*/*/include/new
-%{_libdir}/gcc-lib/%{_target_cpu}*/*/include/typeinfo
-%{_libdir}/gcc-lib/%{_target_cpu}*/*/include/new.h
+%files -n libstdc++ -f libstdc++.lang
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libstdc++.so.*.*.*
+%ifarch ppc
+%attr(755,root,root) %{_libdir}/nof/libstdc++.so.*.*.*
+%endif
 
-%files objc
+%files -n libstdc++-devel
 %defattr(644,root,root,755)
+%doc libstdc++-v3/docs/html
+%dir %{_includedir}/c++
+%{_includedir}/c++/%{GCC_VERSION}
+%attr(755,root,root) %{_libdir}/libstdc++.so
+%{_libdir}/libstdc++.la
+%ifarch ppc
+%attr(755,root,root) %{_libdir}/nof/libstdc++.so
+%{_libdir}/nof/libstdc++.la
+%endif
 
-%attr(755,root,root) %{_libdir}/gcc-lib/%{_target_cpu}*/*/cc1obj
+%files -n libstdc++-static
+%defattr(644,root,root,755)
+%{_libdir}/libstdc++.a
+%ifarch ppc
+%{_libdir}/nof/libstdc++.a
+%endif
 
-%{_libdir}/gcc-lib/%{_target_cpu}*/*/libobjc.a
+%if %{?!_without_objc:1}0
+%files objc
+%defattr(644,root,root,755)
+%doc gcc/objc/READ*
+%attr(755,root,root) %{_libdir}/gcc-lib/%{_target_cpu}*/*/cc1obj
+%attr(755,root,root) %{_libdir}/libobjc.so
+%{_libdir}/libobjc.la
+%ifarch ppc
+%attr(755,root,root) %{_libdir}/nof/libobjc.so
+%{_libdir}/nof/libobjc.la
+%endif
 %{_libdir}/gcc-lib/%{_target_cpu}*/*/include/objc
 
-%files g77
+%files -n libobjc
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libobjc.so.*.*.*
+%ifarch ppc
+%attr(755,root,root) %{_libdir}/nof/libobjc.so.*.*.*
+%endif
+
+%files -n libobjc-static
 %defattr(644,root,root,755)
+%{_libdir}/libobjc.a
+%ifarch ppc
+%{_libdir}/nof/libobjc.a
+%endif
+%endif
 
+%files g77
+%defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/g77
 %attr(755,root,root) %{_bindir}/f77
-
 %{_infodir}/g77*
-
 %attr(755,root,root) %{_libdir}/gcc-lib/%{_target_cpu}*/*/f771
-%{_libdir}/gcc-lib/%{_target_cpu}*/*/libg2c.a
-
+%{_libdir}/libfrtbegin.a
+%{_libdir}/libg2c.la
+%attr(755,root,root) %{_libdir}/libg2c.so
+%ifarch ppc
+%{_libdir}/nof/libfrtbegin.a
+%{_libdir}/nof/libg2c.la
+%attr(755,root,root) %{_libdir}/nof/libg2c.so
+%endif
+%{_libdir}/gcc-lib/%{_target_cpu}*/*/include/g2c.h
 %{_mandir}/man1/g77.1*
 %{_mandir}/man1/f77.1*
+%lang(ja) %{_mandir}/ja/man1/g77.1*
+%lang(ja) %{_mandir}/ja/man1/f77.1*
 
-%{_libdir}/gcc-lib/%{_target_cpu}*/*/include/g2c.h
-
-%files chill
+%files -n libg2c
 %defattr(644,root,root,755)
-%doc gcc/ch/chill.brochure.gz
-
-%attr(755,root,root) %{_bindir}/chill
-
-%{_infodir}/chill*
+%attr(755,root,root) %{_libdir}/libg2c.so.*.*.*
+%ifarch ppc
+%attr(755,root,root) %{_libdir}/nof/libg2c.so.*.*.*
+%endif
 
-%attr(755,root,root) %{_libdir}/gcc-lib/%{_target_cpu}*/*/cc1chill
-%attr(755,root,root) %{_libdir}/gcc-lib/%{_target_cpu}*/*/chill*.o
-%{_libdir}/gcc-lib/%{_target_cpu}*/*/libchill.a
+%files -n libg2c-static
+%defattr(644,root,root,755)
+%{_libdir}/libg2c.a
+%ifarch ppc
+%{_libdir}/nof/libg2c.a
+%endif
 
+%if %{!?_without_java:1}%{?_without_java:0}
 %files java
 %defattr(644,root,root,755)
-
-%attr(755,root,root) %{_bindir}/gcj
-%attr(755,root,root) %{_bindir}/gcjh
+%doc java-doc/*
+%attr(755,root,root) %{_bindir}/gcj*
+%attr(755,root,root) %{_bindir}/gij
 %attr(755,root,root) %{_bindir}/jcf-dump
-%attr(755,root,root) %{_bindir}/jv-convert
-%attr(755,root,root) %{_bindir}/jv-scan
-
-%{_libdir}/*.spec
-
+%attr(755,root,root) %{_bindir}/jv-*
+%attr(755,root,root) %{_bindir}/rmi*
+%attr(755,root,root) %{_bindir}/jar
+%attr(755,root,root) %{_bindir}/grepjar
 %attr(755,root,root) %{_libdir}/gcc-lib/%{_target_cpu}*/*/jc1
 %attr(755,root,root) %{_libdir}/gcc-lib/%{_target_cpu}*/*/jvgenmain
-
-%files libgcj
+%{_infodir}/gcj*
+%{_mandir}/man1/jcf-*
+%{_mandir}/man1/jv-*
+%{_mandir}/man1/gij*
+%{_mandir}/man1/gcj*
+%{_mandir}/man1/rmi*
+
+%files -n libgcj
 %defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/addr2name.awk
+%attr(755,root,root) %{_libdir}/lib*cj*.so.*
+%ifarch ppc
+%attr(755,root,root) %{_libdir}/nof/lib*cj*.so.*
+%endif
 
-%attr(755,root,root) %{_libdir}/lib*gcj*.so
-%attr(755,root,root) %{_libdir}/lib*gcj*.so.*.*.*
+%files -n libgcj-devel
+%defattr(644,root,root,755)
+%{_includedir}/java
+%{_includedir}/javax
+%{_includedir}/org
+%{_includedir}/gcj
+%{_includedir}/j*.h
+%{_includedir}/gnu/*
+%{_libdir}/gcc-lib/%{_target_cpu}*/*/include/gcj
+%dir %{_libdir}/security
+%{_libdir}/security/*
+%dir %{_datadir}/java
+%{_datadir}/java/libgcj*.jar
+%{_libdir}/lib*cj.spec
+%{_libdir}/lib*cj*.la
+%attr(755,root,root) %{_libdir}/lib*cj*.so
+%ifarch ppc
+%{_libdir}/nof/lib*cj*.la
+%attr(755,root,root) %{_libdir}/nof/lib*cj*.so
+%endif
 
-%files libgcj-static
+%files -n libgcj-static
 %defattr(644,root,root,755)
+%{_libdir}/lib*cj*.a
+%ifarch ppc
+%{_libdir}/nof/lib*cj*.a
+%endif
+%endif
 
-%{_libdir}/lib*gcj*.a
-%{_libdir}/lib*gcj*.la
+%if %{!?_without_ada:1}%{?_without_ada:0}
+%files ada
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/gcc-lib/%{_target_cpu}*/*/gnat1
+%{_libdir}/gcc-lib/%{_target_cpu}*/*/adainclude
+%dir %{_libdir}/gcc-lib/%{_target_cpu}*/*/adalib
+%{_libdir}/gcc-lib/%{_target_cpu}*/*/adalib/*.ali
+%ifnarch ppc
+%{_libdir}/gcc-lib/%{_target_cpu}*/*/adalib/libgmem.a
+%endif
+%{_libdir}/gcc-lib/%{_target_cpu}*/*/adalib/Makefile.adalib
+%attr(755,root,root) %{_bindir}/gnat*
+%{_infodir}/gnat*
+%attr(755,root,root) %{_libdir}/libgnat.so*
+%attr(755,root,root) %{_libdir}/libgnarl.so*
 
-%files -n libstdc++
-%attr(755,root,root) %{_libdir}/libstdc++.so.*.*.*
+%files -n libgnat
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libgna*-*so
 
-%files -n libstdc++-devel
-%defattr(644,root,root,755) 
-%{_includedir}/g++
-%attr(755,root,root) %{_libdir}/libstdc++.so
+%files -n libgnat-static
+%defattr(644,root,root,755)
+%{_libdir}/gcc-lib/%{_target_cpu}*/*/adalib/libgna*.a
+%endif
 
-%files -n libstdc++-static
-%attr(644,root,root) %{_libdir}/libstdc++.a
+%files ksi
+%defattr(644,root,root,755)
+%doc gcc/ksi/README gcc/ksi/NEWS gcc/ksi/t/*.{ksi,c,foo}
+%{_infodir}/ksi*
+%attr(755,root,root) %{_libdir}/gcc-lib/%{_target_cpu}*/*/ksi1
 
 %files -n cpp
 %defattr(644,root,root,755)
-%attr(755,root,root) /lib/cpp
-
+%attr(755,root,root) %{_slibdir}/cpp
+%attr(755,root,root) %{_bindir}/cpp
+%attr(755,root,root) %{_libdir}/gcc-lib/%{_target_cpu}*/*/cpp0
+%attr(755,root,root) %{_libdir}/gcc-lib/%{_target_cpu}*/*/tradcpp0
 %{_mandir}/man1/cpp.1*
-%{_mandir}/man1/cccp.1*
-%{_infodir}/cpp.info*.gz
-
-%attr(755,root,root) %{_libdir}/gcc-lib/%{_target_cpu}*/*/cpp
+%lang(ja) %{_mandir}/ja/man1/cpp.1*
+%{_infodir}/cpp*