- rel 0.5

[packages/gcc.git] / gcc.spec

diff --git a/gcc.spec b/gcc.spec
index a5a0634486071ca7e59e1fd408dfa297417026d4..8c5a01405406b0ce754672afdf4de9e5623d7952 100644 (file)
--- a/gcc.spec
+++ b/gcc.spec
@@ -14,7 +14,7 @@ Summary:      GNU Compiler Collection
 Summary(pl):   Kolekcja kompilatorów GNU
 Name:          gcc
 Version:       %{GCC_VERSION}
-Release:       0.1
+Release:       0.5
 Epoch:         %{EPOCH}
 License:       GPL
 Group:         Development/Languages
@@ -26,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
@@ -47,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
@@ -67,7 +68,6 @@ Patch44:      gcc32-tls2.patch
 Patch45:       gcc32-tls3.patch
 Patch46:       gcc32-tls4.patch
 Patch47:       gcc32-tls5.patch
-Patch48:       gcc32-bison_expect.patch
 BuildRequires: autoconf
 BuildRequires: bison
 BuildRequires: fileutils >= 4.0.41
@@ -213,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}
@@ -254,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
@@ -273,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,10 +522,12 @@ mv ksi-%{KSI_VERSION} gcc/ksi
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-#%patch3 -p1
+%patch3 -p1
 %patch4 -p1
+%patch5 -p1
+%patch7 -p1
 
-#%patch10
+%patch10 -p1
 %patch11
 %patch12
 %patch13
@@ -525,7 +545,6 @@ mv ksi-%{KSI_VERSION} gcc/ksi
 %patch25
 %patch26
 %patch27
-#%patch28
 %patch29
 %patch30
 %patch31
@@ -545,10 +564,8 @@ mv ksi-%{KSI_VERSION} gcc/ksi
 %patch45
 %patch46
 %patch47
-#%patch48
 
-# fixme
-#%patch6 -p1
+%patch6 -p1
 
 perl -p -i -e 's/";/ (PLD Linux)";/' gcc/version.c
 
@@ -624,12 +641,12 @@ echo .so g77.1 > $RPM_BUILD_ROOT%{_mandir}/man1/f77.1
 
 %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 \
+mv $RPM_BUILD_ROOT%{_libdir}/gcc-lib/%{_target_cpu}*/*/adalib/*-*so.1 \
        $RPM_BUILD_ROOT%{_libdir}
-rm -f $RPM_BUILD_ROOT%{_libdir}/gcc-lib/%{_target_cpu}*/*/adalib/*.so
+rm -f $RPM_BUILD_ROOT%{_libdir}/gcc-lib/%{_target_cpu}*/*/adalib/*.so.1
 (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)
+ ln -s libgnat-*so.1 libgnat.so.1   && ln -s libgnat-*so.1 libgnat.so && \
+ ln -s libgnarl-*so.1 libgnarl.so.1 && ln -s libgnarl-*so.1 libgnarl.so)
 %endif
 
 ln -sf %{_bindir}/cpp $RPM_BUILD_ROOT/lib/cpp
@@ -878,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
@@ -888,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
@@ -915,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
@@ -946,7 +966,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n libgnat
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libgna*-*so
+%attr(755,root,root) %{_libdir}/libgna*-*so.1
 
 %files -n libgnat-static
 %defattr(644,root,root,755)