Abandon gcc-3.3/3.4

This commit is contained in:
Ralf Corsepius
2011-08-06 05:25:41 +00:00
parent 8435f8e4f7
commit df7be64fa5
5 changed files with 2 additions and 42 deletions

View File

@@ -22,16 +22,9 @@ GCC files that are shared by all targets.
%{_infodir}/cppinternals.info*
%{_infodir}/gcc.info*
%{_infodir}/gccint.info*
%if "%{gcc_version}" >= "3.4"
%{_infodir}/gccinstall.info*
%endif
%sysdir %{_mandir}
%if "%{gcc_version}" < "3.4"
%sysdir %{_mandir}/man1
%{_mandir}/man1/cpp.1*
%{_mandir}/man1/gcov.1*
%endif
%sysdir %{_mandir}/man7
%{_mandir}/man7/fsf-funding.7*
%{_mandir}/man7/gfdl.7*
@@ -42,9 +35,7 @@ GCC files that are shared by all targets.
/sbin/install-info --info-dir=%{_infodir} %{_infodir}/cppinternals.info.gz || :
/sbin/install-info --info-dir=%{_infodir} %{_infodir}/gcc.info.gz || :
/sbin/install-info --info-dir=%{_infodir} %{_infodir}/gccint.info.gz || :
%if "%{gcc_version}" >= "3.4"
/sbin/install-info --info-dir=%{_infodir} %{_infodir}/gccinstall.info.gz || :
%endif
%preun -n @rpmprefix@gcc-common
if [ $1 -eq 0 ]; then
@@ -52,9 +43,7 @@ if [ $1 -eq 0 ]; then
/sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/cppinternals.info.gz || :
/sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gcc.info.gz || :
/sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gccint.info.gz || :
%if "%{gcc_version}" >= "3.4"
/sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gccinstall.info.gz || :
%endif
fi
%endif

View File

@@ -19,21 +19,13 @@ This is the files for gcc/java (gcj) that are shared by all targets.
%files -n @rpmprefix@gcc-gcj-common
%defattr(-,root,root)
%if "%{gcc_version}" <= "3.4"
%sysdir %{_bindir}
%{_bindir}/jar%{_exeext}
%{_bindir}/grepjar%{_exeext}
%endif
%sysdir %{_infodir}
%ghost %{_infodir}/dir
%{_infodir}/gcj.info*
%if "%{gcc_version}" >= "3.3"
%{_infodir}/fastjar.info*
%endif
%if "%{gcc_version}" < "4.0"
%if "%{gcc_version}" >= "3.3"
%sysdir %{_mandir}
%sysdir %{_mandir}/man1
%{_mandir}/man1/gcjh.1*
@@ -46,22 +38,15 @@ This is the files for gcc/java (gcj) that are shared by all targets.
%{_mandir}/man1/jar.1*
%{_mandir}/man1/grepjar.1*
%endif
%endif
%post -n @rpmprefix@gcc-gcj-common
/sbin/install-info --info-dir=%{_infodir} %{_infodir}/gcj.info* || :
%if "%{gcc_version}" >= "3.3"
/sbin/install-info --info-dir=%{_infodir} %{_infodir}/fastjar.info* || :
%endif
/sbin/install-info --info-dir=%{_infodir} %{_infodir}/fastjar.info* || :
%preun -n @rpmprefix@gcc-gcj-common
if [ $1 -eq 0 ]; then
/sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gcj.info* || :
%if "%{gcc_version}" >= "3.3"
/sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/fastjar.info* || :
%endif
/sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/fastjar.info* || :
fi
%endif

View File

@@ -51,17 +51,13 @@
# mv $RPM_BUILD_ROOT%{_bindir}/gfortran $RPM_BUILD_ROOT%{_bindir}/@tool_target@-gfortran
%endif
%if "%{gcc_version}" >= "3.4"
# Bug in gcc-3.4.0pre
rm -f $RPM_BUILD_ROOT%{_bindir}/@tool_target@-@tool_target@-gcjh%{_exeext}
%endif
%if "%{gcc_version}" >= "3.3"
# Bug in gcc-3.3.x/gcc-3.4.x: Despite we don't need fixincludes, it installs
# the fixinclude-install-tools
rm -rf ${RPM_BUILD_ROOT}%{gcclib}/@tool_target@/%{gcc_version}/install-tools
rm -rf ${RPM_BUILD_ROOT}%{gccexec}/@tool_target@/%{gcc_version}/install-tools
%endif
# Bug in gcc > 4.1.0: Installs an unused, empty directory
if test -d ${RPM_BUILD_ROOT}%{_prefix}/@tool_target@/include/bits; then

View File

@@ -21,17 +21,13 @@ GNU cc compiler for @tool_target@.
%sysdir %{_mandir}
%sysdir %{_mandir}/man1
%{_mandir}/man1/@tool_target@-gcc.1*
%if "%{gcc_version}" >= "3.4"
%{_mandir}/man1/@tool_target@-cpp.1*
%{_mandir}/man1/@tool_target@-gcov.1*
%endif
%sysdir %{_bindir}
%{_bindir}/@tool_target@-cpp%{_exeext}
%{_bindir}/@tool_target@-gcc%{_exeext}
%if "%{gcc_version}" >= "3.3"
%{_bindir}/@tool_target@-gcc-%{gcc_version}%{_exeext}
%endif
%{_bindir}/@tool_target@-gcov%{_exeext}
%{_bindir}/@tool_target@-gccbug

View File

@@ -25,8 +25,6 @@ This is the gcc/java compiler for @tool_target@
%{_bindir}/@tool_target@-jcf-dump%{_exeext}
%{_bindir}/@tool_target@-jv-scan%{_exeext}
%{_bindir}/@tool_target@-gcjh%{_exeext}
%if "%{gcc_version}" >= "3.4"
%{_bindir}/@tool_target@-*jar%{_exeext}
%{_mandir}/man1/@tool_target@-*jar.1*
@@ -34,15 +32,12 @@ This is the gcc/java compiler for @tool_target@
%{_mandir}/man1/@tool_target@-jv-*.1*
%{_mandir}/man1/@tool_target@-jcf-dump.1*
%{_mandir}/man1/@tool_target@-gij.1*
%endif
%if "%{gcc_version}" >= "4.0"
%{_mandir}/man1/@tool_target@-grmi*.1*
%else
%if "%{gcc_version}" >= "3.4"
%{_mandir}/man1/@tool_target@-rmi*.1*
%endif
%endif
%dir %{gccexec}
%dir %{gccexec}/@tool_target@
@@ -51,4 +46,3 @@ This is the gcc/java compiler for @tool_target@
%{gccexec}/@tool_target@/%{gcc_version}/jvgenmain%{_exeext}
%endif