libgcj requires zlib (because we use external zlib library in gcc)

[packages/gcc4.git] / gcc4.spec

diff --git a/gcc4.spec b/gcc4.spec
index 819c7acc2a53033bfcbe1646e8b7fd678e0b79c5..79c4abdf51c0c084e1a63f645eb9a7bcc6eee7e7 100644 (file)
--- a/gcc4.spec
+++ b/gcc4.spec
@@ -1,5 +1,5 @@
 %define                STDC_VERSION    3.0.0
-%define                GCJ_VERSION     1.0.0
+%define                GCJ_VERSION     3.0.0
 %define                snap            20010305
 Summary:       GNU Compiler Collection
 Summary(pl):   Kolekcja kompilatorów GNU
@@ -166,6 +166,7 @@ Summary:    Java Class Libraries
 Summary(pl):   Biblioteki Klas Javy
 Group:         Libraries
 Version:       %{GCJ_VERSION}
+Requires:      zlib
 
 %description -n libgcj
 Java Class Libraries
@@ -333,7 +334,7 @@ Preprocesor C umo
   odpowiada fragment pliku wynikowego.
 
 %prep
-%setup -q -n %{name}-%{release}
+%setup -q -n %{name}-%{snap}
 
 %build
 rm -rf obj-%{_target_platform} && install -d obj-%{_target_platform} && cd obj-%{_target_platform} 
@@ -454,9 +455,6 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/gcc-lib/%{_target_cpu}*/*/collect2
 %attr(755,root,root) %{_libdir}/libgcc_s.so*
 
-%attr(755,root,root) %{_libdir}/libsupc++.la
-%{_libdir}/libsupc++.a
-
 %{_libdir}/gcc-lib/%{_target_cpu}*/*/include/float.h
 %{_libdir}/gcc-lib/%{_target_cpu}*/*/include/iso646.h
 %{_libdir}/gcc-lib/%{_target_cpu}*/*/include/limits.h
@@ -474,6 +472,8 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/c++
 %attr(755,root,root) %{_bindir}/c++filt
 %attr(755,root,root) %{_libdir}/gcc-lib/%{_target_cpu}*/*/cc1plus
+%attr(755,root,root) %{_libdir}/libsupc++.la
+%{_libdir}/libsupc++.a
 %{_infodir}/c-tree*
 %{_infodir}/g++int*
 
@@ -523,7 +523,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n libgcj
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/lib*cj*.so.*.*.*
+%attr(755,root,root) %{_libdir}/lib*cj*.so.*
 
 %files -n libgcj-devel
 %defattr(644,root,root,755)
@@ -547,7 +547,7 @@ rm -rf $RPM_BUILD_ROOT
 %files -n libstdc++-devel
 %defattr(644,root,root,755)
 %{_includedir}/g++*
-%{_prefix}/{_target_cpu}*
+%{_prefix}/%{_target_cpu}*
 %attr(755,root,root) %{_libdir}/libstdc++.so
 
 %files -n libstdc++-static