- rel 0.5

[packages/gcc.git] / gcc.spec

diff --git a/gcc.spec b/gcc.spec
index 91bbe9ec1ba61fd3effe04465fe7229b59489d43..8c5a01405406b0ce754672afdf4de9e5623d7952 100644 (file)
--- a/gcc.spec
+++ b/gcc.spec
@@ -1,11 +1,12 @@
 #
 # Conditional build:
-# _without_ada - build without ADA support
-# _without_java        - build without Java support
+# _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.1
+%define                GCC_VERSION     3.2.2
 %define                KSI_VERSION     pre55
 %define                EPOCH           5
 
@@ -13,7 +14,7 @@ Summary:      GNU Compiler Collection
 Summary(pl):   Kolekcja kompilatorów GNU
 Name:          gcc
 Version:       %{GCC_VERSION}
-Release:       2
+Release:       0.5
 Epoch:         %{EPOCH}
 License:       GPL
 Group:         Development/Languages
@@ -25,8 +26,9 @@ 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
+Patch7:                %{name}-ada-link-new-libgnat.patch
 # -- stolen patches from RH --
 Patch10:       gcc32-ada-link.patch
 Patch11:       gcc32-attr-visibility.patch
@@ -46,7 +48,7 @@ Patch24:      gcc32-duplicate-decl.patch
 Patch25:       gcc32-dwarf2-pr6381.patch
 Patch26:       gcc32-dwarf2-pr6436-test.patch
 Patch27:       gcc32-fde-merge-compat.patch
-Patch28:       gcc32-fold-const-associate.patch
+
 Patch29:       gcc32-hard-reg-sharing.patch
 Patch30:       gcc32-hard-reg-sharing2.patch
 Patch31:       gcc32-i386-default-momit-leaf-frame-pointer.patch
@@ -211,7 +213,7 @@ Statyczne biblioteki Obiektowego C.
 %package g77
 Summary:       Fortran 77 support for gcc
 Summary(pl):   Obs³uga Fortranu 77 dla gcc
-Group:         Development/Languages
+Group:         Development/Languages/Fortran
 Version:       %{GCC_VERSION}
 Obsoletes:     egcs-g77
 Requires:      libg2c = %{GCC_VERSION}
@@ -252,14 +254,13 @@ Statyczne biblioteki Fortranu 77.
 %package java
 Summary:       Java support for gcc
 Summary(pl):   Obs³uga Javy dla gcc
-Group:         Development/Languages
+Group:         Development/Languages/Java
 Version:        %{GCC_VERSION}
 Requires:      %{name} = %{version}
 Requires:      libgcj >= 3.0.0
 Requires:      libgcj-devel >= 3.0.0
+Requires:      java-shared
 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
@@ -271,6 +272,25 @@ Wsparcie dla kompilowania program
 do natywnego kodu. Dodatkowo wymagany jest pakiet libgcj, aby mo¿na
 by³o przeprowadziæ kompilacjê.
 
+%package java-tools
+Summary:       Shared java tools
+Summary(pl):   Wspó³dzielone narzêdzia javy
+Group:          Development/Languages/Java
+Version:        %{GCC_VERSION}
+Provides:      jar = %{epoch}:%{GCC_VERSION}-%{release}
+Provides:      java-shared
+Obsoletes:     fastjar
+Obsoletes:      java-shared
+Obsoletes:      jar
+
+%description java-tools
+This package contains tools that are common for every Java(tm) implementation,
+such as rmic or jar.
+
+%description java-tools -l pl
+Pakiet ten zawiera narzêdzia wspólne dla ka¿dej implementacji Javy(tm), takie
+jak rmic czy jar.
+
 %package -n libgcj
 Summary:       Java Class Libraries
 Summary(pl):   Biblioteki Klas Javy
@@ -504,14 +524,16 @@ mv ksi-%{KSI_VERSION} gcc/ksi
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
+%patch7 -p1
 
-%patch10
+%patch10 -p1
 %patch11
 %patch12
 %patch13
 %patch14
 %patch15
-%patch16
+#%patch16
 %patch17
 %patch18
 %patch19
@@ -523,7 +545,6 @@ mv ksi-%{KSI_VERSION} gcc/ksi
 %patch25
 %patch26
 %patch27
-%patch28
 %patch29
 %patch30
 %patch31
@@ -562,7 +583,7 @@ TEXCONFIG=false ../configure \
        --enable-shared \
        --enable-threads=posix \
        --enable-__cxa_atexit \
-        --enable-languages="c,c++,f77,gcov,objc,ksi%{!?_without_ada:,ada}%{!?_without_java:,java}" \
+        --enable-languages="c,c++,f77,gcov%{?!_without_objc:,objc},ksi%{!?_without_ada:,ada}%{!?_without_java:,java}" \
        --enable-c99 \
        --enable-long-long \
        --enable-multilib \
@@ -643,7 +664,9 @@ 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
 
+%if %{?!_without_objc:1}0
 cp -f libobjc/README gcc/objc/README.libobjc
 %endif
 
@@ -802,6 +825,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/nof/libstdc++.a
 %endif
 
+%if %{?!_without_objc:1}0
 %files objc
 %defattr(644,root,root,755)
 %doc gcc/objc/READ*
@@ -827,6 +851,7 @@ rm -rf $RPM_BUILD_ROOT
 %ifarch ppc
 %{_libdir}/nof/libobjc.a
 %endif
+%endif
 
 %files g77
 %defattr(644,root,root,755)
@@ -870,8 +895,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}/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
@@ -880,8 +903,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/jv-*
 %{_mandir}/man1/gij*
 %{_mandir}/man1/gcj*
+
+%files java-tools
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/rmi*
+%attr(755,root,root) %{_bindir}/jar
 %{_mandir}/man1/rmi*
 
+
 %files -n libgcj
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/addr2name.awk
@@ -907,7 +936,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/lib*cj*.la
 %attr(755,root,root) %{_libdir}/lib*cj*.so
 %ifarch ppc
-%{_libdir}/nof/lib*cj.spec
 %{_libdir}/nof/lib*cj*.la
 %attr(755,root,root) %{_libdir}/nof/lib*cj*.so
 %endif