From 99c0b19b81047dcc2d7e05d1bc7c495b79536a70 Mon Sep 17 00:00:00 2001
From: Ralf Corsepius <ralf.corsepius@rtems.org>
Date: Fri, 27 Nov 2009 07:17:05 +0000
Subject: Eliminate g77

---
 contrib/crossrpms/gcc/base-g77.add        | 35 -------------------------------
 contrib/crossrpms/gcc/gccnewlib.add       |  4 ++--
 contrib/crossrpms/gcc/install.add         |  2 +-
 contrib/crossrpms/gcc/prep.add            |  2 +-
 contrib/crossrpms/gcc/target-g77.add      | 32 ----------------------------
 contrib/crossrpms/gcc/target-gfortran.add |  2 +-
 6 files changed, 5 insertions(+), 72 deletions(-)
 delete mode 100644 contrib/crossrpms/gcc/base-g77.add
 delete mode 100644 contrib/crossrpms/gcc/target-g77.add

diff --git a/contrib/crossrpms/gcc/base-g77.add b/contrib/crossrpms/gcc/base-g77.add
deleted file mode 100644
index a3f7a7f293..0000000000
--- a/contrib/crossrpms/gcc/base-g77.add
+++ /dev/null
@@ -1,35 +0,0 @@
-%if %build_infos
-%if %build_g77
-# ==============================================================
-# @rpmprefix@gcc-g77-common
-# ==============================================================
-%package -n @rpmprefix@gcc-g77-common
-Summary:        Base package for RTEMS gcc/g77 compiler
-Group:          Development/Tools
-Version:        %{gcc_rpmvers}
-License:	GPL
-
-Requires(post): 	/sbin/install-info
-Requires(preun): 	/sbin/install-info
-
-%description -n @rpmprefix@gcc-g77-common
-RTEMS is an open source operating system for embedded systems.
-
-This is the files for gcc/g77 that are shared by all targets.
-
-%files -n @rpmprefix@gcc-g77-common
-%defattr(-,root,root)
-%sysdir %{_infodir}
-%ghost %{_infodir}/dir
-%{_infodir}/g77.info*.gz
-
-%post -n @rpmprefix@gcc-g77-common
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/g77.info.gz || :
-
-%preun -n @rpmprefix@gcc-g77-common
-if [ $1 -eq 0 ]; then
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/g77.info.gz || :
-fi
-
-%endif
-%endif
diff --git a/contrib/crossrpms/gcc/gccnewlib.add b/contrib/crossrpms/gcc/gccnewlib.add
index 652844ae09..0a8d1672f6 100644
--- a/contrib/crossrpms/gcc/gccnewlib.add
+++ b/contrib/crossrpms/gcc/gccnewlib.add
@@ -47,7 +47,7 @@ BuildRequires:  @rpmprefix@@tool_target@-gcc = %{gcc_rpmvers}
 
 %if "%{gcc_version}" >= "4.2.0"
 BuildRequires:	flex bison
-%if %build_f95
+%if %build_fortran
 BuildRequires:	gmp-devel >= 4.1
 %if 0%{?fedora} >= 8
 BuildRequires:  mpfr-devel >= 2.2.1
@@ -84,7 +84,7 @@ BuildRequires:	zlib-devel
 BuildRequires:	gcc-gnat
 BuildRequires:	@rpmprefix@@tool_target@-newlib < %{newlib_version}-@NEWLIB_RPMREL@
 %endif
-%if %build_f95
+%if %build_fortran
 BuildRequires: gmp-devel
 %endif
 
diff --git a/contrib/crossrpms/gcc/install.add b/contrib/crossrpms/gcc/install.add
index 41c8a70466..a135cb02b2 100644
--- a/contrib/crossrpms/gcc/install.add
+++ b/contrib/crossrpms/gcc/install.add
@@ -46,7 +46,7 @@
   rm -rf $RPM_BUILD_ROOT%{_mandir}/man7
 %endif
 
-%if %build_f95
+%if %build_fortran
 #  # Bug in gcc-4.0.0pre
 #  mv $RPM_BUILD_ROOT%{_bindir}/gfortran $RPM_BUILD_ROOT%{_bindir}/@tool_target@-gfortran
 %endif
diff --git a/contrib/crossrpms/gcc/prep.add b/contrib/crossrpms/gcc/prep.add
index 4413603897..a3adba1a09 100644
--- a/contrib/crossrpms/gcc/prep.add
+++ b/contrib/crossrpms/gcc/prep.add
@@ -9,7 +9,7 @@
 %{?PATCH1:%patch1 -p0}
 %endif
 
-%if %build_f95
+%if %build_fortran
 %setup -q -T -D -n %{name}-%{version} -a2
 %{?PATCH2:%patch2 -p0}
 %endif
diff --git a/contrib/crossrpms/gcc/target-g77.add b/contrib/crossrpms/gcc/target-g77.add
deleted file mode 100644
index 1217559c0c..0000000000
--- a/contrib/crossrpms/gcc/target-g77.add
+++ /dev/null
@@ -1,32 +0,0 @@
-%if %build_g77
-# ==============================================================
-# @rpmprefix@@tool_target@-gcc-g77
-# ==============================================================
-%package -n @rpmprefix@@tool_target@-gcc-g77
-Summary:        Fortran 77 support for @tool_target@-gcc
-Group:          Development/Tools
-Version:        %{gcc_rpmvers}
-License:	GPL
-Provides:	@rpmprefix@@tool_target@-g77 = %{gcc_rpmvers}-%{release}
-Obsoletes:	@rpmprefix@@tool_target@-g77 < %{gcc_rpmvers}-%{release}
-
-%if %build_infos
-Requires:       @rpmprefix@gcc-g77-common
-%endif
-Requires:       @rpmprefix@@tool_target@-gcc = %{gcc_rpmvers}-%{release}
-
-%description -n @rpmprefix@@tool_target@-gcc-g77
-GCC Fortran 77 compiler for @tool_target@.
-
-%files -n @rpmprefix@@tool_target@-gcc-g77 -f build/files.g77
-%defattr(-,root,root)
-%{_bindir}/@tool_target@-g77%{_exeext}
-
-%{_mandir}/man1/@tool_target@-g77.1*
-
-%dir %{gccexec}
-%dir %{gccexec}/@tool_target@
-%dir %{gccexec}/@tool_target@/%{gcc_version}
-%{gccexec}/@tool_target@/%{gcc_version}/f771%{_exeext}
-%endif
-
diff --git a/contrib/crossrpms/gcc/target-gfortran.add b/contrib/crossrpms/gcc/target-gfortran.add
index d0c71f973f..dc397eaa84 100644
--- a/contrib/crossrpms/gcc/target-gfortran.add
+++ b/contrib/crossrpms/gcc/target-gfortran.add
@@ -1,4 +1,4 @@
-%if %build_f95
+%if %build_fortran
 # ==============================================================
 # @rpmprefix@@tool_target@-gcc-gfortran
 # ==============================================================
-- 
cgit v1.2.3