- better way of generating ada info

[packages/gcc4.git] / gcc4.spec

diff --git a/gcc4.spec b/gcc4.spec
index 5b15fe2eb5e8a55dcb095315a31822872c820f3c..8e2747af958738417999e44814c4e09513644426 100644 (file)
--- a/gcc4.spec
+++ b/gcc4.spec
@@ -1,4 +1,4 @@
-%define                DASHED_SNAP     2002-04-15
+%define                DASHED_SNAP     2002-04-23
 %define                SNAP            %(echo %{DASHED_SNAP} | sed -e "s#-##g")
 %define                GCC_VERSION     3.1
 %define                STDC_VERSION    4.0.0
@@ -12,7 +12,7 @@ Version:      %{GCC_VERSION}
 Release:       0.%{SNAP}.0
 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/snapshots/%{DASHED_SNAP}/%{name}-%{GCC_VERSION}-%{SNAP}.tar.bz2
 Source1:       ftp://ftp.pld.org.pl/people/malekith/ksi/ksi-%{KSI_VERSION}.tar.gz
 Patch0:                %{name}-slibdir.patch
 Patch1:                %{name}-paths.patch
@@ -442,7 +442,7 @@ 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}-%{SNAP}
 mv ksi-%{KSI_VERSION} gcc/ksi
 %patch0 -p1
 %patch1 -p1
@@ -494,10 +494,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
@@ -621,9 +618,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 +743,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/gnu/*
 %{_libdir}/lib*cj.spec
 %{_libdir}/security/*
-%{_datadir}/libgcj*.jar
+%doc %{_datadir}/java
+%{_datadir}/java/libgcj*.jar
 %attr(755,root,root) %{_libdir}/lib*cj*.la
 %attr(755,root,root) %{_libdir}/lib*cj*.so