- java %files updated.

[packages/gcc4.git] / gcc4.spec

diff --git a/gcc4.spec b/gcc4.spec
index a4b9ac1ae7bc57aa7df49ad48066072348731815..11beedaba1422482cec2d53f3c7a2c446f2a082b 100644 (file)
--- a/gcc4.spec
+++ b/gcc4.spec
@@ -1,22 +1,6 @@
 #
 # TODO:
-#      /usr/include/omp.h
-#   <multilib>
-#      /usr/lib/libgomp.a
-#      /usr/lib/libgomp.la
-#      /usr/lib/libgomp.so.1.0.0
-#   </multilib>
-#      /usr/lib/libgomp.spec
-#      /usr/lib64/gcj-4.2.0/libxmlj.la
-#      /usr/lib64/gcj-4.2.0/libxmlj.so.0.0.0
-#      /usr/lib64/libgcj_bc.a
-#      /usr/lib64/libgcj_bc.so
-#      /usr/lib64/libgcj_bc.so.1.0.0
-#      /usr/lib64/libgomp.a
-#      /usr/lib64/libgomp.la
-#      /usr/lib64/libgomp.so.1.0.0
-#      /usr/lib64/libgomp.spec
-#      /usr/share/classpath/tools/tools.zip
+#              - libgomp subpackage.
 #
 # Conditional build:
 %bcond_without ada             # build without ADA support
@@ -55,8 +39,8 @@ Name:         gcc
 %define                _major_ver      4.2
 %define                _minor_ver      0
 Version:       %{_major_ver}.%{_minor_ver}
-%define                _snap   20061021r117925
-Release:       0.%{_snap}.1
+%define                _snap   20061030r118195
+Release:       0.%{_snap}.2
 #Release:      2
 Epoch:         5
 License:       GPL v2+
@@ -65,7 +49,7 @@ Group:                Development/Languages
 #Source0:      ftp://gcc.gnu.org/pub/gcc/releases/gcc-%{version}/%{name}-%{version}.tar.bz2
 #Source0:      ftp://gcc.gnu.org/pub/gcc/snapshots/4.1-%{_snap}/gcc-4.1-%{_snap}.tar.bz2
 Source0:       gcc-4.2-%{_snap}.tar.bz2
-# Source0-md5: c4bf499f1fd2f8534e6ef65b5bf22c80
+# Source0-md5: 5aa7973cf26b71a34a39431c9f9ecb7c
 Source1:       %{name}-optimize-la.pl
 Patch0:                %{name}-info.patch
 Patch1:                %{name}-nolocalefiles.patch
@@ -82,6 +66,7 @@ Patch11:      %{name}-pr19505.patch
 Patch12:       %{name}-pr20218.patch
 Patch13:       %{name}-pr24669.patch
 Patch14:       %{name}-force_jar_wrapper.patch
+Patch15:       %{name}-pr29512.patch
 URL:           http://gcc.gnu.org/
 BuildRequires: autoconf
 %{?with_tests:BuildRequires:   autogen}
@@ -161,7 +146,7 @@ BuildRoot:  %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define                _libdir32       /usr/lib
 %endif
 
-%define                filterout       -fwrapv -fno-strict-aliasing
+%define                filterout       -fwrapv -fno-strict-aliasing -fsigned-char
 
 %description
 A compiler aimed at integrating all the optimizations and features
@@ -779,6 +764,7 @@ Statyczne biblioteki Obiektowego C.
 %patch12 -p1
 %patch13 -p1
 %patch14 -p1
+%patch15 -p1
 
 # because we distribute modified version of gcc...
 sed -i 's:#define VERSUFFIX.*:#define VERSUFFIX " (PLD-Linux)":' gcc/version.c
@@ -835,7 +821,7 @@ TEXCONFIG=false \
        --enable-secureplt \
 %endif
 %if %{with cxx}
-       --with-gxx-include-dir=%{_includedir}/c++ \
+       --with-gxx-include-dir=%{_includedir}/c++/%{version} \
        --disable-libstdcxx-pch \
        --enable-__cxa_atexit \
        --enable-libstdcxx-allocator=new \
@@ -1042,24 +1028,19 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_libdir}/gcc
 %dir %{_libdir}/gcc/*
 %dir %{_libdir}/gcc/*/*
-
 %attr(755,root,root) %{_bindir}/*-gcc*
 %attr(755,root,root) %{_bindir}/gcc
 %attr(755,root,root) %{_bindir}/gccbug
 %attr(755,root,root) %{_bindir}/gcov
 %attr(755,root,root) %{_bindir}/cc
 %attr(755,root,root) %{_bindir}/cpp
-
 %{_mandir}/man1/cc.1*
 %{_mandir}/man1/cpp.1*
 %{_mandir}/man1/gcc.1*
 %{_mandir}/man1/gcov.1*
-
 %{_infodir}/cpp*
 %{_infodir}/gcc*
-
 %attr(755,root,root) /lib/cpp
-
 %attr(755,root,root) %{_slibdir}/lib*.so
 %{_libdir}/libssp.a
 %{_libdir}/libssp.la
@@ -1088,7 +1069,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/gcc/*/*/crt*.o
 %attr(755,root,root) %{_libdir}/gcc/*/*/cc1
 %attr(755,root,root) %{_libdir}/gcc/*/*/collect2
-
 %dir %{_libdir}/gcc/*/*/include
 %dir %{_libdir}/gcc/*/*/include/ssp
 %{_libdir}/gcc/*/*/include/ssp/*.h
@@ -1201,14 +1181,15 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc libstdc++-v3/docs/html
 %{_includedir}/c++
+%{_includedir}/c++/%{version}
 %{_includedir}/extc++.h
 %{_includedir}/stdc++.h
 %{_includedir}/stdtr1c++.h
 %if %{with java}
-%exclude %{_includedir}/c++/java
-%exclude %{_includedir}/c++/javax
-%exclude %{_includedir}/c++/gcj
-%exclude %{_includedir}/c++/gnu
+%exclude %{_includedir}/c++/%{version}/java
+%exclude %{_includedir}/c++/%{version}/javax
+%exclude %{_includedir}/c++/%{version}/gcj
+%exclude %{_includedir}/c++/%{version}/gnu
 %endif
 %if %{with multilib}
 %{_libdir32}/libstdc++.la
@@ -1289,8 +1270,10 @@ rm -rf $RPM_BUILD_ROOT
 %doc libjava/{ChangeLog,LIBGCJ_LICENSE,NEWS,README,THANKS}
 %attr(755,root,root) %{_bindir}/addr2name.awk
 %attr(755,root,root) %{_bindir}/gij
-%attr(755,root,root) %{_libdir}/libgcj.so.*.*.*
 %attr(755,root,root) %{_libdir}/libgcj-tools.so.*.*.*
+%attr(755,root,root) %{_libdir}/libgcj.so.*.*.*
+%attr(755,root,root) %{_libdir}/libgcj_bc.so
+%attr(755,root,root) %{_libdir}/libgcj_bc.so.*.*.*
 %attr(755,root,root) %{_libdir}/libgij.so.*.*.*
 %attr(755,root,root) %{_libdir}/lib-gnu-awt-xlib.so.*.*.*
 %dir %{_libdir}/gcj-%{version}
@@ -1301,52 +1284,50 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/gcj-%{version}/libjawt.so
 %attr(755,root,root) %{_libdir}/gcj-%{version}/libjvm.so
 %attr(755,root,root) %{_libdir}/gcj-%{version}/libqtpeer.so
+%attr(755,root,root) %{_libdir}/gcj-%{version}/libxmlj.so*
 %{_libdir}/logging.properties
 %{_javadir}/libgcj*.jar
 %{_mandir}/man1/gij*
 
 %files -n libgcj-devel
 %defattr(644,root,root,755)
-%{_includedir}/c++/java
-%{_includedir}/c++/javax
-%{_includedir}/c++/gcj
-%{_includedir}/c++/gnu
+%{_includedir}/c++/%{version}/java
+%{_includedir}/c++/%{version}/javax
+%{_includedir}/c++/%{version}/gcj
+%{_includedir}/c++/%{version}/gnu
 %{_libdir}/gcc/*/*/include/gcj
 %{_libdir}/gcc/*/*/include/jawt.h
 %{_libdir}/gcc/*/*/include/jawt_md.h
 %{_libdir}/gcc/*/*/include/jni.h
 %{_libdir}/gcc/*/*/include/jni_md.h
 %{_libdir}/gcc/*/*/include/jvmpi.h
-%dir %{_libdir}/security
-%{_libdir}/security/*
-%{_libdir}/libgcj.spec
-%attr(755,root,root) %{_libdir}/libgcj.so
-%{_libdir}/libgcj.la
-%attr(755,root,root) %{_libdir}/libgcj-tools.so
-%{_libdir}/libgcj-tools.la
-%attr(755,root,root) %{_libdir}/libgij.so
-%{_libdir}/libgij.la
-%attr(755,root,root) %{_libdir}/lib-gnu-awt-xlib.so
-%{_libdir}/lib-gnu-awt-xlib.la
 %{_libdir}/gcj-%{version}/libgjsmalsa.la
 %{_libdir}/gcj-%{version}/libgjsmdssi.la
 %{_libdir}/gcj-%{version}/libgtkpeer.la
 %{_libdir}/gcj-%{version}/libjawt.la
 %{_libdir}/gcj-%{version}/libjvm.la
 %{_libdir}/gcj-%{version}/libqtpeer.la
+%{_libdir}/gcj-%{version}/libxmlj.la
+%dir %{_libdir}/security
+%{_libdir}/security/*
+%{_libdir}/libgcj.spec
+%{_libdir}/libgcj-tools.la
+%attr(755,root,root) %{_libdir}/libgcj-tools.so
+%{_libdir}/libgcj.la
+%attr(755,root,root) %{_libdir}/libgcj.so
+%{_libdir}/libgij.la
+%attr(755,root,root) %{_libdir}/libgij.so
+%{_libdir}/lib-gnu-awt-xlib.la
+%attr(755,root,root) %{_libdir}/lib-gnu-awt-xlib.so
 %{_pkgconfigdir}/libgcj-%{_major_ver}.pc
 
 %files -n libgcj-static
 %defattr(644,root,root,755)
-%{_libdir}/libgcj.a
+%{_libdir}/gcj-%{version}/libjvm.a
 %{_libdir}/libgcj-tools.a
+%{_libdir}/libgcj.a
+%{_libdir}/libgcj_bc.a
 %{_libdir}/libgij.a
-%{_libdir}/lib-gnu-awt-xlib.a
-%{_libdir}/gcj-%{version}/libjvm.a
-# needs check.
-#{_libdir}/gcj-%{version}/libgtkpeer.a
-#{_libdir}/gcj-%{version}/libjawt.a
-#{_libdir}/gcj-%{version}/libqtpeer.a
 
 %files -n libffi
 %defattr(644,root,root,755)