From df7be64fa5db443c18471b4b417a611bd6a34be2 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Sat, 6 Aug 2011 05:25:41 +0000 Subject: Abandon gcc-3.3/3.4 --- contrib/crossrpms/gcc/base-gcc.add | 11 ----------- contrib/crossrpms/gcc/base-gcj.add | 19 ++----------------- contrib/crossrpms/gcc/install.add | 4 ---- contrib/crossrpms/gcc/target-gcc.add | 4 ---- contrib/crossrpms/gcc/target-gcj.add | 6 ------ 5 files changed, 2 insertions(+), 42 deletions(-) diff --git a/contrib/crossrpms/gcc/base-gcc.add b/contrib/crossrpms/gcc/base-gcc.add index 0b9e5447b5..219a127b1d 100644 --- a/contrib/crossrpms/gcc/base-gcc.add +++ b/contrib/crossrpms/gcc/base-gcc.add @@ -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 diff --git a/contrib/crossrpms/gcc/base-gcj.add b/contrib/crossrpms/gcc/base-gcj.add index 6ad98195a8..d9ba5df0a4 100644 --- a/contrib/crossrpms/gcc/base-gcj.add +++ b/contrib/crossrpms/gcc/base-gcj.add @@ -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 diff --git a/contrib/crossrpms/gcc/install.add b/contrib/crossrpms/gcc/install.add index a135cb02b2..55ba310c95 100644 --- a/contrib/crossrpms/gcc/install.add +++ b/contrib/crossrpms/gcc/install.add @@ -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 diff --git a/contrib/crossrpms/gcc/target-gcc.add b/contrib/crossrpms/gcc/target-gcc.add index 0e4fc99cb4..cfa42da8c2 100644 --- a/contrib/crossrpms/gcc/target-gcc.add +++ b/contrib/crossrpms/gcc/target-gcc.add @@ -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 diff --git a/contrib/crossrpms/gcc/target-gcj.add b/contrib/crossrpms/gcc/target-gcj.add index d74078ae44..051c0d8e0a 100644 --- a/contrib/crossrpms/gcc/target-gcj.add +++ b/contrib/crossrpms/gcc/target-gcj.add @@ -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 - -- cgit v1.2.3