This commit was manufactured by cvs2git to create branch 'AC-branch'.

[packages/gcc.git] / gcc.spec

diff --git a/gcc.spec b/gcc.spec
index 88728fc349b1cc580e7f8150f4c3571e618972bb..fe42ccdc40e1b3507383f8690a580a6d2d14f06b 100644 (file)
--- a/gcc.spec
+++ b/gcc.spec
@@ -7,7 +7,7 @@
 #
 %define                DASHED_SNAP     %{nil}
 %define                SNAP            %(echo %{DASHED_SNAP} | sed -e "s#-##g")
-%define                GCC_VERSION     3.3.4
+%define                GCC_VERSION     3.3.5
 %define                KSI_VERSION     1.1.0.1567
 
 Summary:       GNU Compiler Collection: the C compiler and shared files
@@ -16,12 +16,13 @@ Summary(pl):        Kolekcja kompilator
 Summary(pt_BR):        Coleção dos compiladores GNU: o compilador C e arquivos compartilhados
 Name:          gcc
 Version:       %{GCC_VERSION}
-Release:       4
+Release:       1
 Epoch:         5
 License:       GPL
 Group:         Development/Languages
 Source0:       ftp://gcc.gnu.org/pub/gcc/releases/gcc-%{GCC_VERSION}/%{name}-%{GCC_VERSION}.tar.bz2
-# Source0-md5: a1c267b34f05c8660b24251865614d8b
+# Source0-md5: 70ee088b498741bb08c779f9617df3a5
+# Source0-size:        23833856
 Source1:       ftp://ftp.pld-linux.org/people/malekith/ksi/ksi-%{KSI_VERSION}.tar.gz
 # Source1-md5: 66f07491b44f06928fd95b0e65bb8cd3
 Source2:       http://ep09.pld-linux.org/~djrzulf/gcc33/%{name}-non-english-man-pages.tar.bz2
@@ -32,8 +33,7 @@ Patch2:               %{name}-nolocalefiles.patch
 Patch3:                %{name}-ada-link-new-libgnat.patch
 Patch4:                %{name}-nodebug.patch
 Patch5:                %{name}-cse-find_best_addr.patch
-Patch6:                %{name}-alpha-regno-mode.patch
-Patch7:                %{name}-amd64-thunk.patch
+Patch6:                %{name}-amd64-thunk.patch
 # -- stolen patches from RH --
 Patch10:       gcc32-ada-link.patch
 Patch11:       gcc32-boehm-gc-libs.patch
@@ -50,6 +50,7 @@ Patch21:      gcc32-inline-label.patch
 Patch22:       gcc32-java-no-rpath.patch
 Patch23:       gcc32-test-rh65771.patch
 Patch24:       gcc32-test-rotate.patch
+Patch25:       gcc-cmpi.patch
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: binutils >= 2:2.15.90.0.3
@@ -63,8 +64,9 @@ BuildRequires:        perl-devel
 BuildRequires: texinfo >= 4.1
 BuildRequires: zlib-devel
 Requires:      binutils >= 2:2.15.90.0.3
-Requires:      cpp = %{epoch}:%{GCC_VERSION}
-Requires:      libgcc = %{epoch}:%{GCC_VERSION}
+Requires:      cpp = %{epoch}:%{GCC_VERSION}-%{release}
+Requires:      gcc-dirs
+Requires:      libgcc = %{epoch}:%{GCC_VERSION}-%{release}
 %{?with_ada:Provides: gcc(ada)}
 Conflicts:     glibc-devel < 2.2.5-20
 URL:           http://gcc.gnu.org/
@@ -758,12 +760,9 @@ mv ksi-%{KSI_VERSION} gcc/ksi
 %patch3 -p1
 %{!?debug:%patch4 -p1}
 %patch5 -p1
-%ifarch alpha
-%patch6 -p1
-%endif
 %ifarch amd64
 # not sure if it wouldn't break x86 (it shouldn't, but better safe than sorry)
-%patch7 -p1
+%patch6 -p1
 %endif
 
 %patch10 -p1
@@ -782,6 +781,7 @@ mv ksi-%{KSI_VERSION} gcc/ksi
 %patch22
 %patch23
 %patch24
+%patch25 -p1
 
 # because we distribute modified version of gcc...
 perl -pi -e 's/(version.*)";/$1 (PLD Linux)";/' gcc/version.c
@@ -970,8 +970,6 @@ rm -rf $RPM_BUILD_ROOT
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc READ* ChangeLog
-%dir %{_libdir}/gcc-lib
-%dir %{_libdir}/gcc-lib/*
 %dir %{_libdir}/gcc-lib/*/*
 %dir %{_libdir}/gcc-lib/*/*/include
 %attr(755,root,root) %{_bindir}/*-gcc*
@@ -1125,7 +1123,6 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/gij
 %attr(755,root,root) %{_bindir}/jcf-dump
 %attr(755,root,root) %{_bindir}/jv-*
-%attr(755,root,root) %{_bindir}/grepjar
 %attr(755,root,root) %{_bindir}/*-gcj
 %attr(755,root,root) %{_libdir}/gcc-lib/*/*/jc1
 %attr(755,root,root) %{_libdir}/gcc-lib/*/*/jvgenmain
@@ -1134,14 +1131,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/jv-*
 %{_mandir}/man1/gij*
 %{_mandir}/man1/gcj*
-%{_mandir}/man1/grepjar*
 
 %files java-tools
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/rmi*
 %attr(755,root,root) %{_bindir}/jar
+%attr(755,root,root) %{_bindir}/grepjar
 %{_mandir}/man1/rmi*
 %{_mandir}/man1/jar*
+%{_mandir}/man1/grepjar*
 %{_infodir}/fastjar*
 
 %files -n libgcj