- gcc r: libgcc = %%{version} (libgcc_s.so is needed to build shared

[packages/gcc.git] / gcc.spec

diff --git a/gcc.spec b/gcc.spec
index 5b15fe2eb5e8a55dcb095315a31822872c820f3c..99a081a24be4d281e4b4687d288e89689ee4bb68 100644 (file)
--- a/gcc.spec
+++ b/gcc.spec
@@ -1,4 +1,4 @@
-%define                DASHED_SNAP     2002-04-15
+%define                DASHED_SNAP     %{nil}
 %define                SNAP            %(echo %{DASHED_SNAP} | sed -e "s#-##g")
 %define                GCC_VERSION     3.1
 %define                STDC_VERSION    4.0.0
@@ -9,16 +9,15 @@ Summary:      GNU Compiler Collection
 Summary(pl):   Kolekcja kompilatorów GNU
 Name:          gcc
 Version:       %{GCC_VERSION}
-Release:       0.%{SNAP}.0
+Release:       1
 License:       GPL
 Group:         Development/Languages
-Source0:       ftp://gcc.gnu.org/pub/gcc/snapshots/%{DASHED_SNAP}/%{name}-%{SNAP}.tar.bz2
+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
 Patch0:                %{name}-slibdir.patch
 Patch1:                %{name}-paths.patch
 Patch2:                %{name}-ada-no-addr2line.patch
 Patch3:                %{name}-ada-no-prefix.o.patch
-Patch4:                %{name}-ppc-ada-hack.patch
 BuildRequires: bison
 BuildRequires: texinfo >= 4.1
 BuildRequires: zlib-devel
@@ -27,8 +26,9 @@ BuildRequires:        autoconf
 BuildRequires: gcc
 BuildRequires: gcc-ada
 BuildRequires: perl-devel
-Requires:      binutils >= 2.12.90.0.1
+Requires:      binutils >= 2.12.90.0.4
 Requires:      cpp = %{version}
+Requires:      libgcc = %{version}
 URL:           http://gcc.gnu.org/
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -442,15 +442,12 @@ Ten pakiet zawiera biblioteki statyczne potrzebne do uruchamiania
 programów napisanych w Adzie.
 
 %prep
-%setup -q -a1 -n %{name}-%{SNAP}
+%setup -q -a1 -n %{name}-%{GCC_VERSION}
 mv ksi-%{KSI_VERSION} gcc/ksi
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%ifarch ppc
-%patch4 -p1
-%endif
 
 %build
 # cd gcc && autoconf; cd ..
@@ -494,10 +491,7 @@ cd ..
        infodir=%{_infodir}
 
 # make Gnat Reference Manual
-cd gcc/ada
-ln -s ../doc/include/fdl.texi gfdl.texi
-makeinfo gnat_rm.texi
-cd ../..
+%{__make} -C obj-%{_target_platform}/gcc/ada doc
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -537,12 +531,12 @@ ln -sf %{_bindir}/cpp $RPM_BUILD_ROOT/lib/cpp
 
 cd ..
 
-install gcc/ada/gnat_rm.info* $RPM_BUILD_ROOT%{_infodir}
+install  obj-%{_target_platform}/gcc/ada/gnat_rm.info* $RPM_BUILD_ROOT%{_infodir}
 
 gzip -9nf READ* ChangeLog
 gzip -9nf gcc/ksi/README gcc/ksi/NEWS gcc/ksi/t/*.{ksi,c,foo}
 
-mkdir java-doc
+install -d java-doc
 mv -f libjava/doc/cni.sgml libjava/READ* java-doc
 mv -f fastjar/README java-doc/README.fastjar
 mv -f libffi/README java-doc/README.libffi
@@ -621,9 +615,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/gcc-lib/%{_target_cpu}*/*/libgcc.a
 %{_libdir}/gcc-lib/%{_target_cpu}*/*/libgcc_eh.a
 %{_libdir}/gcc-lib/%{_target_cpu}*/*/specs
-#%ifnarch alpha
 %attr(644,root,root) %{_libdir}/gcc-lib/%{_target_cpu}*/*/crt*.o
-#%endif
 %attr(755,root,root) %{_libdir}/gcc-lib/%{_target_cpu}*/*/cc1
 %attr(755,root,root) %{_libdir}/gcc-lib/%{_target_cpu}*/*/collect2
 
@@ -748,7 +740,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/gnu/*
 %{_libdir}/lib*cj.spec
 %{_libdir}/security/*
-%{_datadir}/libgcj*.jar
+%dir %{_datadir}/java
+%{_datadir}/java/libgcj*.jar
 %attr(755,root,root) %{_libdir}/lib*cj*.la
 %attr(755,root,root) %{_libdir}/lib*cj*.so