#
# TODO:
-# - http://gcc.gnu.org/PR11203 (inline-asm)
-# - http://gcc.gnu.org/PR20128 (ice with mudflap + profile generate)
+# - libgomp subpackage.
#
# Conditional build:
%bcond_without ada # build without ADA support
+%bcond_without cxx # build without C++ support
%bcond_without fortran # build without Fortran support
%bcond_without java # build without Java support
%bcond_without objc # build without Objective-C support
%bcond_without objcxx # build without Objective-C++ support
%bcond_with multilib # build with multilib support (it needs glibc[32&64]-devel)
-%bcond_without profiling # build without profiling
+%bcond_with profiling # build with profiling
%bcond_without bootstrap # omit 3-stage bootstrap
%bcond_with tests # torture gcc
-# debuginfo not needed for devel snaps.
-%define _enable_debug_packages 0
+%if %{without cxx}
+%undefine with_java
+%undefine with_objcxx
+%endif
%if %{without objc}
%undefine with_objcxx
Summary(pl): Kolekcja kompilatorów GNU: kompilator C i pliki wspó³dzielone
Summary(pt_BR): Coleção dos compiladores GNU: o compilador C e arquivos compartilhados
Name: gcc
-Version: 4.1.0
-%define _snap 20050707T1814UTC
-Release: 0.%{_snap}.1
+%define _major_ver 4.2
+%define _minor_ver 0
+Version: %{_major_ver}.%{_minor_ver}
+%define _snap 20061030r118195
+Release: 0.%{_snap}.2
+#Release: 2
Epoch: 5
License: GPL v2+
Group: Development/Languages
+#Source0: ftp://gcc.gnu.org/pub/gcc/prerelease-%{version}-%{_snap}/gcc-%{version}-%{_snap}.tar.bz2
#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.1-%{_snap}.tar.bz2
-# Source0-md5: 884d79586713e1733466f6774e1c2b76
+Source0: gcc-4.2-%{_snap}.tar.bz2
+# Source0-md5: 5aa7973cf26b71a34a39431c9f9ecb7c
Source1: %{name}-optimize-la.pl
Patch0: %{name}-info.patch
Patch1: %{name}-nolocalefiles.patch
Patch2: %{name}-nodebug.patch
-Patch3: %{name}-ada-link-new-libgnat.patch
-Patch4: %{name}-ada-link.patch
+Patch3: %{name}-ada-link.patch
+Patch4: %{name}-sparc64-ada_fix.patch
Patch5: %{name}-alpha-ada_fix.patch
-Patch6: %{name}-ada-fwrapv.patch
-# PRs
-Patch10: %{name}-pr7776.patch
-Patch11: %{name}-pr20297.patch
-Patch12: %{name}-pr21704.patch
-Patch13: %{name}-pr17640.patch
-Patch14: %{name}-pr22037.patch
-Patch15: %{name}-pr19055.patch
+Patch6: %{name}-ppc64-m32-m64-multilib-only.patch
+Patch7: %{name}-libjava-multilib.patch
+Patch8: %{name}-enable-java-awt-qt.patch
+Patch9: %{name}-pr13676.patch
+Patch10: %{name}-pr17390.patch
+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}
BuildRequires: automake
-BuildRequires: binutils >= 2:2.15.94.0.1
+# binutils 2.16.91 or newer are required for compiling medium model now
+BuildRequires: binutils >= 2:2.16.91.0.1
BuildRequires: bison
-%{?with_java:BuildRequires: cairo-devel}
+BuildRequires: chrpath >= 0.13-2
%{?with_tests:BuildRequires: dejagnu}
BuildRequires: fileutils >= 4.0.41
BuildRequires: flex
BuildRequires: gcc-ada
%endif
BuildRequires: gettext-devel
-BuildRequires: glibc-devel >= %{!?with_multilib:2.2.5-20}%{?with_multilib:6:2.3.4-1.5}
-%if %{with fortran}
-BuildRequires: gmp-devel
-BuildRequires: libmpfr-devel
+BuildRequires: glibc-devel >= 6:2.4-1
+%if %{with multilib}
+%ifarch %{x8664}
+BuildRequires: glibc-devel(i686)
+%endif
+%ifarch ppc64
+BuildRequires: glibc-devel(ppc)
%endif
-%{?with_java:BuildRequires: pango-devel}
-BuildRequires: perl-devel
-%{?with_java:BuildRequires: pkgconfig}
+%ifarch s390x
+BuildRequires: glibc-devel(s390)
+%endif
+%ifarch sparc64
+BuildRequires: glibc-devel(sparc)
+%endif
+%endif
+BuildRequires: perl-base
BuildRequires: rpmbuild(macros) >= 1.211
BuildRequires: texinfo >= 4.1
BuildRequires: zlib-devel
+%if %{with fortran}
+BuildRequires: gmp-devel
+BuildRequires: mpfr-devel
+%endif
+%if %{with java}
+BuildRequires: QtGui-devel >= 4.0.1
+BuildRequires: alsa-lib-devel
+BuildRequires: cairo-devel >= 0.5.0
+BuildRequires: dssi
+BuildRequires: jack-audio-connection-kit-devel
+BuildRequires: gtk+2-devel >= 2:2.4.0
+BuildRequires: libart_lgpl-devel >= 2.1
+BuildRequires: libxslt-devel
+BuildRequires: pango-devel
+BuildRequires: pkgconfig
+BuildRequires: qt4-build
+BuildRequires: xorg-lib-libXtst-devel
+BuildRequires: zip
+BuildRequires: unzip
+%endif
# AS_NEEDED directive for dynamic linker
# http://sources.redhat.com/ml/glibc-cvs/2005-q1/msg00614.html
# http://sources.redhat.com/ml/binutils/2005-01/msg00288.html
%define _libdir32 /usr/lib
%endif
+%define filterout -fwrapv -fno-strict-aliasing -fsigned-char
+
%description
A compiler aimed at integrating all the optimizations and features
necessary for a high-performance and stable development environment.
%prep
#setup -q -n gcc-%{version}
-%setup -q -n gcc-4.1-%{_snap}
-
+%setup -q -n gcc-4_2-branch
%patch0 -p1
%patch1 -p1
-%{!?debug:%patch2 -p1}
+%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p1
-
-# PRs
-%patch10 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
+#patch10 -p1 not quite correct / temp. disabled.
%patch11 -p1
%patch12 -p1
%patch13 -p1
%patch15 -p1
# because we distribute modified version of gcc...
-perl -pi -e 's/(version.*)";/$1 (PLD Linux)";/' gcc/version.c
+sed -i 's:#define VERSUFFIX.*:#define VERSUFFIX " (PLD-Linux)":' gcc/version.c
perl -pi -e 's@(bug_report_url.*<URL:).*";@$1http://bugs.pld-linux.org/>";@' gcc/version.c
mv ChangeLog ChangeLog.general
cd gcc
%{__autoconf}
cd ..
+cd libjava
+%{__autoconf}
+cd classpath
+%{__autoconf}
+cd ../..
cp -f /usr/share/automake/config.sub .
-rm -rf obj-%{_target_platform}
-install -d obj-%{_target_platform}
-cd obj-%{_target_platform}
+rm -rf builddir && install -d builddir && cd builddir
CFLAGS="%{rpmcflags}" \
CXXFLAGS="%{rpmcxxflags}" \
TEXCONFIG=false \
../configure \
--prefix=%{_prefix} \
+ --with-local-prefix=%{_prefix}/local \
--libdir=%{_libdir} \
--libexecdir=%{_libdir} \
--infodir=%{_infodir} \
--mandir=%{_mandir} \
+ --x-libraries=%{_libdir} \
--enable-shared \
--enable-threads=posix \
- --enable-__cxa_atexit \
- --enable-languages="c,c++%{?with_fortran:,f95}%{?with_objc:,objc}%{?with_objcxx:,obj-c++}%{?with_ada:,ada}%{?with_java:,java}" \
+ --enable-languages="c%{?with_cxx:,c++}%{?with_fortran:,fortran}%{?with_objc:,objc}%{?with_objcxx:,obj-c++}%{?with_ada:,ada}%{?with_java:,java}" \
--enable-c99 \
--enable-long-long \
--%{?with_multilib:en}%{!?with_multilib:dis}able-multilib \
--with-demangler-in-ld \
--with-system-zlib \
--with-slibdir=%{_slibdir} \
- --without-x \
+%ifnarch ia64
+ --without-system-libunwind \
+%else
+ --with-system-libunwind \
+%endif
+ %{!?with_java:--without-x} \
%{?with_fortran:--enable-cmath} \
+ --with-long-double-128 \
+%ifarch ppc ppc64
+ --enable-secureplt \
+%endif
+%if %{with cxx}
+ --with-gxx-include-dir=%{_includedir}/c++/%{version} \
+ --disable-libstdcxx-pch \
+ --enable-__cxa_atexit \
+ --enable-libstdcxx-allocator=new \
+%endif
%if %{with java}
+ --disable-libjava-multilib \
--enable-libgcj \
--enable-libgcj-multifile \
--enable-libgcj-database \
--enable-gtk-cairo \
+ --enable-java-awt=qt,gtk,xlib \
+ --enable-jni \
+ --enable-xmlj \
+ --enable-alsa \
+ --enable-dssi \
%endif
+ --%{?with_bootstrap:en}%{!?with_bootstrap:dis}able-bootstrap \
%{_target_platform}
cd ..
-%{__make} -C obj-%{_target_platform} \
- %{?with_bootstrap:%{?with_profiling:profiled}bootstrap} \
+%{__make} -C builddir \
+ %{?with_bootstrap:%{?with_profiling:profiledbootstrap}} \
GCJFLAGS="%{rpmcflags}" \
BOOT_CFLAGS="%{rpmcflags}" \
STAGE1_CFLAGS="%{rpmcflags} -O0" \
+ GNATLIBCFLAGS="%{rpmcflags}" \
LDFLAGS_FOR_TARGET="%{rpmldflags}" \
mandir=%{_mandir} \
infodir=%{_infodir}
-%{?with_tests:%{__make} -k -C obj-%{_target_platform} check}
+%{?with_tests:%{__make} -k -C builddir check 2>&1 ||:}
%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT{/lib,%{_aclocaldir},%{_datadir},%{_infodir}}
-cd obj-%{_target_platform}
+cd builddir
%{__make} -j1 install \
mandir=%{_mandir} \
ln -sf gcc $RPM_BUILD_ROOT%{_bindir}/cc
echo ".so gcc.1" > $RPM_BUILD_ROOT%{_mandir}/man1/cc.1
+libssp=$(cd $RPM_BUILD_ROOT%{_libdir}; echo libssp.so.*.*.*)
+mv $RPM_BUILD_ROOT{%{_libdir}/$libssp,%{_slibdir}}
+ln -sf %{_slibdir}/$libssp $RPM_BUILD_ROOT%{_libdir}/libssp.so
+%if %{with multilib}
+libssp=$(cd $RPM_BUILD_ROOT%{_libdir32}; echo libssp.so.*.*.*)
+mv $RPM_BUILD_ROOT{%{_libdir32}/$libssp,%{_slibdir32}}
+ln -sf %{_slibdir32}/$libssp $RPM_BUILD_ROOT%{_libdir32}/libssp.so
+%endif
+
%if %{with fortran}
ln -sf gfortran $RPM_BUILD_ROOT%{_bindir}/g95
echo ".so gfortran.1" > $RPM_BUILD_ROOT%{_mandir}/man1/g95.1
mv -f $RPM_BUILD_ROOT%{_libdir}/gcc/*/*/adalib/*.so.1 \
$RPM_BUILD_ROOT%{_libdir}
# check if symlink to be made is valid
-test -f $RPM_BUILD_ROOT%{_libdir}/libgnat-4.0.so.1
-ln -sf libgnat-4.0.so.1 $RPM_BUILD_ROOT%{_libdir}/libgnat-4.0.so
-ln -sf libgnarl-4.0.so.1 $RPM_BUILD_ROOT%{_libdir}/libgnarl-4.0.so
-ln -sf libgnat-4.0.so $RPM_BUILD_ROOT%{_libdir}/libgnat.so
-ln -sf libgnarl-4.0.so $RPM_BUILD_ROOT%{_libdir}/libgnarl.so
+test -f $RPM_BUILD_ROOT%{_libdir}/libgnat-4.2.so.1
+ln -sf libgnat-4.2.so.1 $RPM_BUILD_ROOT%{_libdir}/libgnat-4.2.so
+ln -sf libgnarl-4.2.so.1 $RPM_BUILD_ROOT%{_libdir}/libgnarl-4.2.so
+ln -sf libgnat-4.2.so $RPM_BUILD_ROOT%{_libdir}/libgnat.so
+ln -sf libgnarl-4.2.so $RPM_BUILD_ROOT%{_libdir}/libgnarl.so
%endif
cd ..
%if %{with java}
install -d java-doc
cp -f libjava/READ* java-doc
-cp -f fastjar/README java-doc/README.fastjar
-cp -f libffi/README java-doc/README.libffi
-cp -f libffi/LICENSE java-doc/LICENSE.libffi
ln -sf %{_javadir}/libgcj-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/libgcj.jar
+rm -f $RPM_BUILD_ROOT%{_libdir}/classpath/libgjs*.la
+# tools.zip sources
+rm -rf $RPM_BUILD_ROOT%{_datadir}/classpath/tools/gnu
%endif
%if %{with objc}
cp -f libobjc/README gcc/objc/README.libobjc
# avoid -L poisoning in *.la - there should be only -L%{_libdir}/gcc/*/%{version}
# normalize libdir, to avoid propagation of unnecessary RPATHs by libtool
-for f in libmudflap.la libmudflapth.la libstdc++.la libsupc++.la \
- %{?with_fortran:libgfortran.la libgfortranbegin.la} \
- %{?with_java:libgcj.la libffi.la} \
+for f in libgomp.la libmudflap.la libmudflapth.la libssp.la libssp_nonshared.la \
+ %{?with_cxx:libstdc++.la libsupc++.la} \
+ %{?with_fortran:libgfortran.la} \
+%if %{with java}
+ libgcj.la libgcj-tools.la libffi.la lib-gnu-awt-xlib.la \
+ gcj-%{version}/libgtkpeer.la gcj-%{version}/libjawt.la gcj-%{version}/libjvm.la gcj-%{version}/libqtpeer.la \
+ gcj-%{version}/libgjsmalsa.la gcj-%{version}/libgjsmdssi.la gcj-%{version}/libxmlj.la \
+%endif
%{?with_objc:libobjc.la};
do
%{SOURCE1} $RPM_BUILD_ROOT%{_libdir}/$f %{_libdir} > $RPM_BUILD_ROOT%{_libdir}/$f.fixed
mv $RPM_BUILD_ROOT%{_libdir}/$f{.fixed,}
+done
%if %{with multilib}
+for f in libgomp.la libmudflap.la libmudflapth.la libssp.la libssp_nonshared.la \
+ %{?with_cxx:libstdc++.la libsupc++.la} \
+ %{?with_fortran:libgfortran.la} \
+ %{?with_java:libffi.la} \
+ %{?with_objc:libobjc.la};
+do
%{SOURCE1} $RPM_BUILD_ROOT%{_libdir32}/$f %{_libdir32} > $RPM_BUILD_ROOT%{_libdir32}/$f.fixed
mv $RPM_BUILD_ROOT%{_libdir32}/$f{.fixed,}
-%endif
done
+%endif
# include/ contains install-tools/include/* and headers that were fixed up
# by fixincludes, we don't want former
gccdir=$(echo $RPM_BUILD_ROOT%{_libdir}/gcc/*/*/)
mkdir $gccdir/tmp
+
# we have to save these however
-%{?with_java:mv -f $gccdir/include/{gcj,libffi/ffitarget.h,jawt.h,jawt_md.h,jni.h,jvmpi.h} $gccdir/tmp}
-%{?with_objc:mv -f $gccdir/include/objc $gccdir/tmp}
-mv -f $gccdir/include/syslimits.h $gccdir/tmp
-rm -rf $gccdir/include
-mv -f $gccdir/tmp $gccdir/include
-cp -f $gccdir/install-tools/include/*.h $gccdir/include
+%{?with_java:mv $gccdir/include/{gcj,ffi.h,ffitarget.h,jawt.h,jawt_md.h,jni.h,jni_md.h,jvmpi.h} $gccdir/tmp}
+%{?with_objc:mv $gccdir/include/objc $gccdir/tmp}
+mv $gccdir/include/mf-runtime.h $gccdir/tmp
+mv $gccdir/include/syslimits.h $gccdir/tmp
+mv $gccdir/include/ssp $gccdir/tmp
+rm -rf $gccdir/include
+mv $gccdir/tmp $gccdir/include
+cp $gccdir/install-tools/include/*.h $gccdir/include
# but we don't want anything more from install-tools
-rm -rf $gccdir/install-tools
-
-%if %{with multilib}
-ln -sf %{_slibdir32}/libgcc_s.so.1 $gccdir/32/libgcc_s.so
-%endif
-ln -sf %{_slibdir}/libgcc_s.so.1 $gccdir/libgcc_s.so
+rm -rf $gccdir/install-tools
%find_lang gcc
+%find_lang cpplib
+cat cpplib.lang >> gcc.lang
+
+%if %{with cxx}
%find_lang libstdc\+\+
+install libstdc++-v3/include/precompiled/* $RPM_BUILD_ROOT%{_includedir}
+%endif
# cvs snap doesn't contain (release does) below files,
# so let's create dummy entries to satisfy %%files.
%dir %{_libdir}/gcc
%dir %{_libdir}/gcc/*
%dir %{_libdir}/gcc/*/*
-%dir %{_libdir}/gcc/*/*/include
-
%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
+%attr(755,root,root) %{_libdir}/libssp.so
+%{_libdir}/libssp_nonshared.a
+%{_libdir}/libssp_nonshared.la
%if %{with multilib}
+%attr(755,root,root) %{_slibdir32}/lib*.so
%dir %{_libdir}/gcc/*/*/32
%{_libdir}/gcc/*/*/32/libgcov.a
%{_libdir}/gcc/*/*/32/libgcc.a
%{_libdir}/gcc/*/*/32/libgcc_eh.a
-%{_libdir}/gcc/*/*/32/libgcc_s.so
+%{_libdir32}/libssp.a
+%{_libdir32}/libssp.la
+%attr(755,root,root) %{_libdir32}/libssp.so
+%{_libdir32}/libssp_nonshared.a
+%{_libdir32}/libssp_nonshared.la
%endif
%{_libdir}/gcc/*/*/libgcov.a
%{_libdir}/gcc/*/*/libgcc.a
%{_libdir}/gcc/*/*/libgcc_eh.a
-%{_libdir}/gcc/*/*/libgcc_s.so
%{_libdir}/gcc/*/*/specs
%if %{with multilib}
%{_libdir}/gcc/*/*/32/crt*.o
%{_libdir}/gcc/*/*/crt*.o
%attr(755,root,root) %{_libdir}/gcc/*/*/cc1
%attr(755,root,root) %{_libdir}/gcc/*/*/collect2
-
-%{_libdir}/gcc/*/*/include/*.h
+%dir %{_libdir}/gcc/*/*/include
+%dir %{_libdir}/gcc/*/*/include/ssp
+%{_libdir}/gcc/*/*/include/ssp/*.h
+%{_libdir}/gcc/*/*/include/decfloat.h
+%{_libdir}/gcc/*/*/include/float.h
+%{_libdir}/gcc/*/*/include/iso646.h
+%{_libdir}/gcc/*/*/include/limits.h
+%{_libdir}/gcc/*/*/include/stdarg.h
+%{_libdir}/gcc/*/*/include/stdbool.h
+%{_libdir}/gcc/*/*/include/stddef.h
+%{_libdir}/gcc/*/*/include/syslimits.h
+%{_libdir}/gcc/*/*/include/unwind.h
+%{_libdir}/gcc/*/*/include/varargs.h
+%ifarch %{ix86} %{x8664}
+%{_libdir}/gcc/*/*/include/emmintrin.h
+%{_libdir}/gcc/*/*/include/mm3dnow.h
+%{_libdir}/gcc/*/*/include/mm_malloc.h
+%{_libdir}/gcc/*/*/include/mmintrin.h
+%{_libdir}/gcc/*/*/include/pmmintrin.h
+%{_libdir}/gcc/*/*/include/xmmintrin.h
+%endif
%files -n libgcc
%defattr(644,root,root,755)
%files -n libmudflap-devel
%defattr(644,root,root,755)
-%{_includedir}/mf-runtime.h
+%{_libdir}/gcc/*/*/include/mf-runtime.h
%if %{with multilib}
%{_libdir32}/libmudflap*.la
%attr(755,root,root) %{_libdir32}/libmudflap*.so
%{_libdir}/gcc/*/*/adalib/libgnat.a
%endif
+%if %{with cxx}
%files c++
%defattr(644,root,root,755)
%doc gcc/cp/{ChangeLog,NEWS}
%files -n libstdc++-devel
%defattr(644,root,root,755)
%doc libstdc++-v3/docs/html
-%dir %{_includedir}/c++
+%{_includedir}/c++
%{_includedir}/c++/%{version}
+%{_includedir}/extc++.h
+%{_includedir}/stdc++.h
+%{_includedir}/stdtr1c++.h
%if %{with java}
%exclude %{_includedir}/c++/%{version}/java
%exclude %{_includedir}/c++/%{version}/javax
%exclude %{_includedir}/c++/%{version}/gcj
%exclude %{_includedir}/c++/%{version}/gnu
%endif
-%ifnarch sparc
-%exclude %{_includedir}/c++/%{version}/*/bits/stdc++.h.gch
-%endif
%if %{with multilib}
%{_libdir32}/libstdc++.la
%attr(755,root,root) %{_libdir32}/libstdc++.so
%{_libdir32}/libstdc++.a
%endif
%{_libdir}/libstdc++.a
+%endif
%if %{with fortran}
%files fortran
%doc gcc/fortran/ChangeLog
%attr(755,root,root) %{_bindir}/g95
%attr(755,root,root) %{_bindir}/gfortran
+%attr(755,root,root) %{_bindir}/*-gfortran
%{_infodir}/gfortran*
%attr(755,root,root) %{_libdir}/gcc/*/*/f951
+%{_libdir}/gcc/*/*/libgfortranbegin.a
%if %{with multilib}
-%{_libdir32}/libgfortranbegin.a
-%{_libdir32}/libgfortranbegin.la
+%{_libdir}/gcc/*/*/32/libgfortranbegin.a
%{_libdir32}/libgfortran.la
%attr(755,root,root) %{_libdir32}/libgfortran.so
%endif
-%{_libdir}/libgfortranbegin.a
-%{_libdir}/libgfortranbegin.la
%{_libdir}/libgfortran.la
%attr(755,root,root) %{_libdir}/libgfortran.so
%{_mandir}/man1/g95.1*
%files java
%defattr(644,root,root,755)
%doc gcc/java/ChangeLog java-doc/*
-%attr(755,root,root) %{_bindir}/fastjar
+%attr(755,root,root) %{_bindir}/gappletviewer
%attr(755,root,root) %{_bindir}/gcj*
+%attr(755,root,root) %{_bindir}/gjarsigner
%attr(755,root,root) %{_bindir}/gjnih
-%attr(755,root,root) %{_bindir}/grepjar
+%attr(755,root,root) %{_bindir}/gkeytool
%attr(755,root,root) %{_bindir}/grmi*
+%attr(755,root,root) %{_bindir}/jar
%attr(755,root,root) %{_bindir}/jcf-dump
%attr(755,root,root) %{_bindir}/jv-*
%attr(755,root,root) %{_bindir}/*-gcj*
%attr(755,root,root) %{_libdir}/gcc/*/*/jc1
%attr(755,root,root) %{_libdir}/gcc/*/*/jvgenmain
-%{_infodir}/fastjar*
%{_infodir}/gcj*
-%{_mandir}/man1/fastjar*
%{_mandir}/man1/gcj*
%{_mandir}/man1/gjnih*
-%{_mandir}/man1/grepjar*
%{_mandir}/man1/grmi*
%{_mandir}/man1/jcf-*
%{_mandir}/man1/jv-*
%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-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}
%{_libdir}/gcj-%{version}/classmap.db
-%attr(755,root,root) %{_libdir}/lib*cj*.so.*.*.*
-%attr(755,root,root) %{_libdir}/libgij.so.*.*.*
+%attr(755,root,root) %{_libdir}/gcj-%{version}/libgjsmalsa.so*
+%attr(755,root,root) %{_libdir}/gcj-%{version}/libgjsmdssi.so*
+%attr(755,root,root) %{_libdir}/gcj-%{version}/libgtkpeer.so
+%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*
%{_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
+%{_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}/lib*cj.spec
-%{_libdir}/lib*cj*.la
-%attr(755,root,root) %{_libdir}/lib*cj*.so
+%{_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
-%{_pkgconfigdir}/libgcj.pc
+%{_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}/lib*cj*.a
+%{_libdir}/gcj-%{version}/libjvm.a
+%{_libdir}/libgcj-tools.a
+%{_libdir}/libgcj.a
+%{_libdir}/libgcj_bc.a
%{_libdir}/libgij.a
%files -n libffi
%defattr(644,root,root,755)
%doc libffi/{ChangeLog,ChangeLog.libgcj,LICENSE,README}
+%if %{with multilib}
+%attr(755,root,root) %{_libdir32}/libffi.so.*.*.*
+%endif
%attr(755,root,root) %{_libdir}/libffi.so.*.*.*
%files -n libffi-devel
%defattr(644,root,root,755)
+%{_libdir}/gcc/*/*/include/ffi.h
%{_libdir}/gcc/*/*/include/ffitarget.h
+%if %{with multilib}
+%attr(755,root,root) %{_libdir32}/libffi.so
+%{_libdir32}/libffi.la
+%endif
%attr(755,root,root) %{_libdir}/libffi.so
%{_libdir}/libffi.la
-%{_includedir}/ffi.h
%files -n libffi-static
%defattr(644,root,root,755)
+%if %{with multilib}
+%{_libdir32}/libffi.a
+%endif
%{_libdir}/libffi.a
%endif