- resurrected info patch and non-english-man-pages

- gcc32-typeof-asm patch is obsolete (included in pre-3.2.1)
- added gnat_ug_unx infos to -ada

Changed files:
    gcc-info.patch -> 1.5
    gcc.spec -> 1.115
    gcc32-typeof-asm.patch -> 1.2

diff --git a/gcc-info.patch b/gcc-info.patch
index 9f559cb9718ba07baea2dd89a33f8d96e36e1dd8..7df833fc000897e4453bd6cdd236748cb3ea335c 100644 (file)
--- a/gcc-info.patch
+++ b/gcc-info.patch
@@ -1,58 +1,262 @@
---- gcc-2.95.1.orig/gcc/cpp.texi       Tue May 18 01:37:18 1999
-+++ gcc-2.95.1/gcc/cpp.texi    Thu Aug 19 12:46:15 1999
-@@ -3,9 +3,9 @@
- @settitle The C Preprocessor
+Note: gnat_ug.texi is postprocessed by some tool - so it may not
+contain tab characters - spaces must be used instead.
+In other *.texi we can use tabs.
+
+--- gcc-3.2/gcc/doc/cpp.texi.orig      Fri Nov  1 22:58:48 2002
++++ gcc-3.2/gcc/doc/cpp.texi   Fri Nov  1 23:03:38 2002
+@@ -53,9 +53,9 @@
+ @set cppmanual
  
  @ifinfo
 -@dircategory Programming
-+@dircategory Programming tools:
++@dircategory Programming Languages:
  @direntry
 -* Cpp: (cpp).                The GNU C preprocessor.
 +* Cpp: (cpp).                         The GNU C preprocessor
  @end direntry
  @end ifinfo
  
---- gcc-2.95.1.orig/gcc/f/g77.texi     Mon Jun 21 13:58:54 1999
-+++ gcc-2.95.1/gcc/f/g77.texi  Thu Aug 19 12:46:15 1999
-@@ -71,9 +71,9 @@
- @c @end tex
+--- gcc-3.2/gcc/doc/cppinternals.texi.orig     Mon Jan  7 20:03:36 2002
++++ gcc-3.2/gcc/doc/cppinternals.texi  Fri Nov  1 23:04:42 2002
+@@ -3,9 +3,9 @@
+ @settitle The GNU C Preprocessor Internals
  
  @ifinfo
 -@dircategory Programming
-+@dircategory Programming tools:
++@dircategory Programming Languages:
  @direntry
--* g77: (g77).                  The GNU Fortran compiler.
-+* g77: (g77).                         The GNU Fortran compiler
+-* Cpplib: (cppinternals).      Cpplib internals.
++* Cpplib: (cppinternals).             Cpplib internals
  @end direntry
- @ifset INTERNALS
- @ifset USING
---- gcc-2.95.1.orig/gcc/gcc.texi       Mon Aug  9 08:47:01 1999
-+++ gcc-2.95.1/gcc/gcc.texi    Thu Aug 19 12:47:17 1999
-@@ -80,9 +80,9 @@
- @c @end tex
+ @end ifinfo
  
- @ifinfo
+--- gcc-3.2/gcc/doc/gcc.texi.orig      Fri Nov  1 22:58:48 2002
++++ gcc-3.2/gcc/doc/gcc.texi   Fri Nov  1 23:06:12 2002
+@@ -65,9 +65,9 @@
+ 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
+ @end macro
+ @ifnottex
 -@dircategory Programming
-+@dircategory Programming tools:
++@dircategory Programming Languages:
  @direntry
 -* gcc: (gcc).                  The GNU Compiler Collection.
 +* gcc: (gcc).                         The GNU Compiler Collection
+ @end direntry
+ This file documents the use of the GNU compilers.
+ @sp 1
+--- gcc-3.2/gcc/doc/gccint.texi.orig   Wed Jan 23 18:30:28 2002
++++ gcc-3.2/gcc/doc/gccint.texi        Fri Nov  1 23:06:57 2002
+@@ -51,9 +51,9 @@
+ 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
+ @end macro
+ @ifnottex
+-@dircategory Programming
++@dircategory Programming Languages:
+ @direntry
+-* gccint: (gccint).            Internals of the GNU Compiler Collection.
++* gccint: (gccint).                   Internals of the GNU Compiler Collection
+ @end direntry
+ This file documents the internals of the GNU compilers.
+ @sp 1
+--- gcc-3.2/gcc/ada/gnat-style.texi.orig       Sun Dec 23 12:23:14 2001
++++ gcc-3.2/gcc/ada/gnat-style.texi    Fri Nov  1 23:08:50 2002
+@@ -25,9 +25,9 @@
+ 
+ @setfilename gnat-style.info
+ @settitle GNAT Coding Style
+-@dircategory Programming
++@dircategory Programming Languages:
+ @direntry 
+-* gnat-style: (gnat-style).      GNAT Coding Style
++* gnat-style: (gnat-style).           GNAT Coding Style
+ @end direntry
+ 
+ @macro syntax{element}
+--- gcc-3.2/gcc/ada/gnat_rm.texi.orig  Fri Nov  1 22:58:52 2002
++++ gcc-3.2/gcc/ada/gnat_rm.texi       Fri Nov  1 23:09:45 2002
+@@ -31,9 +31,9 @@
+ @settitle GNAT Reference Manual
+ @setchapternewpage odd
+ @syncodeindex fn cp
+-@dircategory Programming
++@dircategory Programming Languages:
+ @direntry
+-* gnat_rm: (gnat_rm).            GNAT Reference Manual
++* gnat_rm: (gnat_rm).                 GNAT Reference Manual
+ @end direntry
+ 
+ @titlepage
+--- gcc-3.2/gcc/ada/gnat_ug.texi.orig  Fri Nov  1 22:58:52 2002
++++ gcc-3.2/gcc/ada/gnat_ug.texi       Fri Nov  1 23:10:20 2002
+@@ -75,9 +75,9 @@
+ @syncodeindex fn cp
+ @c %**end of header
+ 
+-@dircategory Programming
++@dircategory Programming Languages:
+ @direntry
+-* gnat_ug: (gnat_ug).            GNAT User's Guide
++* gnat_ug: (gnat_ug).                   GNAT User's Guide
+ @end direntry
+ 
+ @titlepage
+--- gcc-3.2/gcc/f/g77.texi.orig        Mon Apr 29 09:58:32 2002
++++ gcc-3.2/gcc/f/g77.texi     Fri Nov  1 23:11:56 2002
+@@ -90,9 +90,9 @@
+ @c @end tex
+ 
+ @ifinfo
+-@dircategory Programming
++@dircategory Programming Languages:
+ @direntry
+-* g77: (g77).                  The GNU Fortran compiler.
++* g77: (g77).                         The GNU Fortran compiler
  @end direntry
  @ifset INTERNALS
  @ifset USING
---- gcc-2.95.1.orig/gcc/ch/chill.texi  Wed Dec 16 21:59:05 1998
-+++ gcc-2.95.1/gcc/ch/chill.texi       Wed Sep 22 22:39:09 1999
-@@ -5,9 +5,10 @@
+--- gcc-3.2/gcc/java/gcj.texi.orig     Sun Aug  4 18:55:55 2002
++++ gcc-3.2/gcc/java/gcj.texi  Fri Nov  1 23:16:39 2002
+@@ -20,26 +20,20 @@
  
  @ifinfo
  @format
--START-INFO-DIR-ENTRY
--* Chill::                       Chill compiler
--END-INFO-DIR-ENTRY
+-@dircategory Programming
++@dircategory Programming Languages:
+ @direntry
+-* Gcj: (gcj).               Ahead-of-time compiler for the Java language
++* Gcj: (gcj).                         Ahead-of-time compiler for the Java language
+ @end direntry
+ 
+-@dircategory Individual utilities
 +@dircategory Programming tools:
-+@direntry
-+* Chill: (chill).                     Chill compiler
-+@end direntry
+ @direntry
+-* gcjh: (gcj)Invoking gcjh.
+-                            Generate header files from Java class files
+-* jv-scan: (gcj)Invoking jv-scan.
+-                            Print information about Java source files
+-* jcf-dump: (gcj)Invoking jcf-dump.
+-                            Print information about Java class files
+-* gij: (gcj)Invoking gij.   GNU interpreter for Java bytecode
+-* jv-convert: (gcj)Invoking jv-convert.
+-                            Convert file from one encoding to another
+-* rmic: (gcj)Invoking rmic.
+-                            Generate stubs for Remote Method Invocation.
+-* rmiregistry: (gcj)Invoking rmiregistry.
+-                            The remote object registry.
++* gcjh: (gcj)gcjh.                    Generate header files from Java class files
++* jv-scan: (gcj)jv-scan.              Print information about Java source files
++* jcf-dump: (gcj)jcf-dump.            Print information about Java class files
++* gij: (gcj)gij.                      GNU interpreter for Java bytecode
++* jv-convert: (gcj)jv-convert.                Convert file from one encoding to another
++* rmic: (gcj)rmic.                    Generate stubs for Remote Method Invocation.
++* rmiregistry: (gcj)rmiregistry.      The remote object registry
+ @end direntry
  @end format
- @end ifinfo
  
+@@ -120,15 +114,15 @@
+ * Copying::            The GNU General Public License
+ * GNU Free Documentation License::
+                       How you can share and copy this manual
+-* Invoking gcj::      Compiler options supported by @command{gcj}
++* gcj::                       Compiler options supported by @command{gcj}
+ * Compatibility::     Compatibility between gcj and other tools for Java
+-* Invoking gcjh::       Generate header files from class files
+-* Invoking jv-scan::    Print information about source files
+-* Invoking jcf-dump::   Print information about class files
+-* Invoking gij::      Interpreting Java bytecodes
+-* Invoking jv-convert:: Converting from one encoding to another
+-* Invoking rmic::        Generate stubs for Remote Method Invocation.
+-* Invoking rmiregistry:: The remote object registry.
++* gcjh::                Generate header files from class files
++* jv-scan::             Print information about source files
++* jcf-dump::            Print information about class files
++* gij::                       Interpreting Java bytecodes
++* jv-convert::          Converting from one encoding to another
++* rmic::                Generate stubs for Remote Method Invocation.
++* rmiregistry::         The remote object registry.
+ * About CNI::           Description of the Cygnus Native Interface
+ * Resources::         Where to look for more information
+ @end menu
+@@ -139,7 +133,7 @@
+ @include fdl.texi
+ 
+ 
+-@node Invoking gcj
++@node gcj
+ @chapter Invoking gcj
+ 
+ @c man title gcj Ahead-of-time compiler for the Java language
+@@ -506,7 +500,7 @@
+ @end itemize
+ 
+ 
+-@node Invoking gcjh
++@node gcjh
+ @chapter Invoking gcjh
+ 
+ @c man title gcjh generate header files from Java class files
+@@ -607,7 +601,7 @@
+ 
+ @c man end
+ 
+-@node Invoking jv-scan
++@node jv-scan
+ @chapter Invoking jv-scan
+ 
+ @c man title jv-scan print information about Java source file
+@@ -665,7 +659,7 @@
+ 
+ @c man end
+ 
+-@node Invoking jcf-dump
++@node jcf-dump
+ @chapter Invoking jcf-dump
+ 
+ @c man title jcf-dump print information about Java class files
+@@ -720,7 +714,7 @@
+ 
+ @c man end
+ 
+-@node Invoking gij
++@node gij
+ @chapter Invoking gij
+ 
+ @c man title gij GNU interpreter for Java bytecode
+@@ -798,7 +792,7 @@
+ 
+ @c man end
+ 
+-@node Invoking jv-convert
++@node jv-convert
+ @chapter Invoking jv-convert
+ 
+ @c man title jv-convert Convert file from one encoding to another
+@@ -857,7 +851,7 @@
+ 
+ @c man end
+ 
+-@node Invoking rmic
++@node rmic
+ @chapter Invoking rmic
+ 
+ @c man title rmic Generate stubs for Remote Method Invocation
+@@ -936,7 +930,7 @@
+ @c man end
+ 
+ 
+-@node Invoking rmiregistry
++@node rmiregistry
+ @chapter Invoking rmiregistry
+ 
+ @c man title rmiregistry Remote object registry
+--- gcc-3.2/gcc/ksi/doc/ksi.texi.orig  Sat Jul 20 22:48:08 2002
++++ gcc-3.2/gcc/ksi/doc/ksi.texi       Fri Nov  1 23:19:39 2002
+@@ -15,7 +15,7 @@
+ @contents
+ 
+ @ifnottex
+-@dircategory Programming tools:
++@dircategory Programming Languages:
+ @direntry
+ * ksi: (ksi).                         Ksi Language and Compiler Manual
+ @end direntry

diff --git a/gcc.spec b/gcc.spec
index c59541b109f17ce0ad4874b54d7f3a38a58bfce6..aeb8ac89fe33c74e82a08b9f8e6778d7a6a92e67 100644 (file)
--- a/gcc.spec
+++ b/gcc.spec
@@ -12,17 +12,19 @@ Summary:    GNU Compiler Collection
 Summary(pl):   Kolekcja kompilatorów GNU
 Name:          gcc
 Version:       %{GCC_VERSION}
-Release:       0.1
+Release:       0.pre.1
 License:       GPL
 Group:         Development/Languages
 Source0:       ftp://gcc.gnu.org/pub/gcc/releases/gcc-%{GCC_VERSION}/%{name}-3.2.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}-march-i686-fix.patch
+Patch6:                %{name}-info.patch
 # -- stolen patches from RH --
 Patch10:       gcc32-ada-link.patch
 Patch11:       gcc32-attr-visibility.patch
@@ -62,7 +64,6 @@ Patch44:      gcc32-tls2.patch
 Patch45:       gcc32-tls3.patch
 Patch46:       gcc32-tls4.patch 
 Patch47:       gcc32-tls5.patch    
-Patch48:       gcc32-typeof-asm.patch  
 Patch100:      gcc-pre-3.2.1.patch.gz
 BuildRequires: autoconf
 BuildRequires: bison
@@ -512,6 +513,7 @@ mv ksi-%{KSI_VERSION} gcc/ksi
 %ifarch %{ix86}
 %patch5 -p0
 %endif
+
 %patch10 
 %patch11 
 %patch12 
@@ -550,7 +552,8 @@ mv ksi-%{KSI_VERSION} gcc/ksi
 %patch45 
 %patch46
 %patch47
-%patch48 
+
+%patch6 -p1
 
 %build
 # cd gcc && autoconf; cd ..
@@ -650,7 +653,8 @@ ln -sf %{_bindir}/cpp $RPM_BUILD_ROOT/lib/cpp
 cd ..
 
 %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_rm.info* $RPM_BUILD_ROOT%{_infodir}
+install obj-%{_target_platform}/gcc/ada/gnat_ug_unx.info* $RPM_BUILD_ROOT%{_infodir}
 %endif
 
 %if %{!?_without_java:1}%{?_without_java:0}
@@ -663,6 +667,9 @@ cp -f libffi/LICENSE java-doc/LICENSE.libffi
 cp -f libobjc/README gcc/objc/README.libobjc
 %endif
 
+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\+\+
 
@@ -728,6 +735,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_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}*/*/libgcc.a
@@ -779,6 +788,8 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 %{_libdir}/libsupc++.a
 %{_mandir}/man1/g++.1*
+%lang(es) %{_mandir}/es/man1/c++filt.1*
+%lang(ja) %{_mandir}/ja/man1/g++.1*
 
 %files -n libstdc++ -f libstdc++.lang
 %defattr(644,root,root,755)
@@ -847,9 +858,11 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_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*
-%{_libdir}/gcc-lib/%{_target_cpu}*/*/include/g2c.h
+%lang(ja) %{_mandir}/ja/man1/g77.1*
+%lang(ja) %{_mandir}/ja/man1/f77.1*
 
 %files -n libg2c
 %defattr(644,root,root,755)
@@ -959,4 +972,5 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/gcc-lib/%{_target_cpu}*/*/cpp0
 %attr(755,root,root) %{_libdir}/gcc-lib/%{_target_cpu}*/*/tradcpp0
 %{_mandir}/man1/cpp.1*
+%lang(ja) %{_mandir}/ja/man1/cpp.1*
 %{_infodir}/cpp*

diff --git a/gcc32-typeof-asm.patch b/gcc32-typeof-asm.patch
deleted file mode 100644 (file)
index ab0db75..0000000
--- a/gcc32-typeof-asm.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-2002-08-08  Jakub Jelinek  <jakub@redhat.com>
-
-       * g++.dg/ext/typeof2.C: New test.
-       * gcc.dg/typeof-1.c: New test.
-       * gcc.dg/typeof-2.c: New test.
-
---- gcc/testsuite/g++.dg/ext/typeof2.C.jj      2002-08-08 14:24:56.000000000 +0200
-+++ gcc/testsuite/g++.dg/ext/typeof2.C 2002-08-08 14:24:39.000000000 +0200
-@@ -0,0 +1,29 @@
-+// Test typeof with __asm redirection
-+// { dg-do compile }
-+// { dg-options "-O2" }
-+
-+extern "C" {
-+  extern int foo1;
-+  extern int foo1 __asm ("bar1");
-+  int foo1 = 1;
-+
-+  extern int foo2 (int);
-+  extern int foo2 (int) __asm ("bar2");
-+  int foo2 (int x)
-+  {
-+    return x;
-+  }
-+
-+  extern int foo3;
-+  extern __typeof (foo3) foo3 __asm ("bar3");
-+  int foo3 = 1;
-+
-+  extern int foo4 (int);
-+  extern __typeof (foo4) foo4 __asm ("bar4");
-+  int foo4 (int x)
-+  {
-+    return x;
-+  }
-+}
-+
-+// { dg-final { scan-assembler-not "foo" } }
---- gcc/testsuite/gcc.dg/typeof-1.c.jj 2002-08-08 14:26:18.000000000 +0200
-+++ gcc/testsuite/gcc.dg/typeof-1.c    2002-08-08 14:26:06.000000000 +0200
-@@ -0,0 +1,27 @@
-+/* Test typeof with __asm redirection. */
-+/* { dg-do compile } */
-+/* { dg-options "-O2" } */
-+
-+extern int foo1;
-+extern int foo1 __asm ("bar1");
-+int foo1 = 1;
-+
-+extern int foo2 (int);
-+extern int foo2 (int) __asm ("bar2");
-+int foo2 (int x)
-+{
-+  return x;
-+}
-+
-+extern int foo3;
-+extern __typeof (foo3) foo3 __asm ("bar3");
-+int foo3 = 1;
-+
-+extern int foo4 (int);
-+extern __typeof (foo4) foo4 __asm ("bar4");
-+int foo4 (int x)
-+{
-+  return x;
-+}
-+
-+// { dg-final { scan-assembler-not "foo" } }
---- gcc/testsuite/gcc.dg/typeof-2.c.jj 2002-08-08 20:42:33.000000000 +0200
-+++ gcc/testsuite/gcc.dg/typeof-2.c    2002-08-08 20:47:53.000000000 +0200
-@@ -0,0 +1,29 @@
-+/* Test typeof with __asm redirection. */
-+/* { dg-do compile } */
-+/* { dg-options "-O2" } */
-+
-+extern int foo1 (int x) __asm ("baz1");
-+int bar1 (int x) { return x; }
-+extern __typeof (bar1) foo1 __attribute ((weak, alias ("bar1")));
-+
-+extern int foo2 (int x) __attribute__ ((const));
-+extern __typeof (foo2) foo2 __asm ("baz2");
-+int bar2 (int x)
-+{
-+  return foo2 (x) + foo2 (x) + foo2 (x) + foo2 (x) + foo2 (x) + foo2 (x);
-+}
-+
-+extern int foo3 (int x);
-+extern __typeof (foo3) foo3 __asm ("baz3");
-+int bar3 (int x)
-+{
-+  return foo3 (x) + foo3 (x) + foo3 (x) + foo3 (x) + foo3 (x) + foo3 (x);
-+}
-+
-+// { dg-final { scan-assembler-not "foo1" } }
-+// { dg-final { scan-assembler "baz1" } }
-+// { dg-final { scan-assembler-not "foo2" } }
-+// { dg-final { scan-assembler "baz2" } }
-+// { dg-final { scan-assembler-not "baz2.*baz2.*baz2.*baz2.*baz2.*baz2" } }
-+// { dg-final { scan-assembler-not "foo3" } }
-+// { dg-final { scan-assembler "baz3.*baz3.*baz3.*baz3.*baz3.*baz3" } }