Sync changes to SLFO-1.2 branch

gcc.changes

@@ -1,8 +1,3 @@
--------------------------------------------------------------------
-Wed May  7 11:27:11 UTC 2025 - Richard Biener <rguenther@suse.com>
-
-- Add packages for Modula-2 and Cobol.
-
 -------------------------------------------------------------------
 Wed Mar 12 17:41:50 UTC 2025 - Richard Biener <rguenther@suse.com>
 

gcc.spec

@@ -53,16 +53,6 @@ Name:           gcc%{gccsuffix}
 %else
 %define build_d 0
 %endif
-%define build_m2 1
-%ifarch x86_64 aarch64 ppc64le riscv64
-%if %{gcc_version} >= 15 && %{suse_version} >= 1699
-%define build_cobol 1
-%else
-%define build_cobol 0
-%endif
-%else
-%define build_cobol 0
-%endif
 %define quadmath_arch %ix86 x86_64 ia64 ppc64le
 %define libgccjit_sover 0
 
@@ -90,12 +80,6 @@ BuildRequires:  gcc%{gcc_version}-ada
 %if %{build_d}
 BuildRequires:  gcc%{gcc_version}-d
 %endif
-%if %{build_m2}
-BuildRequires:  gcc%{gcc_version}-m2
-%endif
-%if %{build_cobol}
-BuildRequires:  gcc%{gcc_version}-cobol
-%endif
 Source:         cpp
 %if "%{gccsuffix}" != "" && 0%{?is_opensuse}
 ExclusiveArch:  do-not-build
@@ -196,8 +180,6 @@ The system GNU Compiler documentation.
 
 
 
-
-
 # install / update the entries
 %post -n gcc%{gccsuffix}-info
 %install_info --info-dir=%{_infodir} --name=cpp --description='The GNU C preprocessor.' %{_infodir}/cpp.info.gz
@@ -513,6 +495,8 @@ Conflicts:      gcc-d
 %endif
 Requires:       gcc%{gcc_version}-d
 Requires:       gcc%{gccsuffix} = %{version}
+Requires(post): update-alternatives
+Requires(postun): update-alternatives
 
 %description -n gcc%{gccsuffix}-d
 The system GNU D Compiler.
@@ -571,62 +555,6 @@ Requires:       libquadmath0-devel-gcc%{gcc_version}
 %description -n libquadmath%{gccsuffix}-devel
 Development files for the quadprecision math library.
 
-%package -n gcc%{gccsuffix}-m2
-Summary:        The system GNU Modula-2 Compiler
-License:        GPL-3.0-or-later
-Group:          Development/Languages/C and C++
-%if "%{gccsuffix}" != ""
-Provides:       gcc-m2 = %{version}
-Conflicts:      gcc-m2
-%endif
-Requires:       gcc%{gcc_version}-m2
-Requires:       gcc%{gccsuffix} = %{version}
-
-%description -n gcc%{gccsuffix}-m2
-The system GNU Modula-2 Compiler.
-
-%package -n gcc%{gccsuffix}-m2-32bit
-Summary:        The system GNU Modula-2 Compiler 32bit support
-License:        GPL-3.0-or-later
-Group:          Development/Languages/C and C++
-%if "%{gccsuffix}" != ""
-Provides:       gcc-m2-32bit = %{version}
-Conflicts:      gcc-m2-32bit
-%endif
-Requires:       gcc%{gcc_version}-m2-32bit
-Requires:       gcc%{gccsuffix}-m2 = %{version}
-
-%description -n gcc%{gccsuffix}-m2-32bit
-The system GNU Modula-2 Compiler 32bit support
-
-%package -n gcc%{gccsuffix}-m2-64bit
-Summary:        The system GNU Modula-2 Compiler 64bit support
-License:        GPL-3.0-or-later
-Group:          Development/Languages/C and C++
-%if "%{gccsuffix}" != ""
-Provides:       gcc-m2-64bit = %{version}
-Conflicts:      gcc-m2-64bit
-%endif
-Requires:       gcc%{gcc_version}-m2-64bit
-Requires:       gcc%{gccsuffix}-m2 = %{version}
-
-%description -n gcc%{gccsuffix}-m2-64bit
-The system GNU Modula-2 Compiler 64bit support
-
-%package -n gcc%{gccsuffix}-cobol
-Summary:        The system GNU Cobol Compiler
-License:        GPL-3.0-or-later
-Group:          Development/Languages/C and C++
-%if "%{gccsuffix}" != ""
-Provides:       gcc-cobol = %{version}
-Conflicts:      gcc-cobol
-%endif
-Requires:       gcc%{gcc_version}-cobol
-Requires:       gcc%{gccsuffix} = %{version}
-
-%description -n gcc%{gccsuffix}-cobol
-The system GNU Cobol Compiler.
-
 %prep
 
 %install
@@ -649,12 +577,6 @@ for program in \
 %endif
 %if %{build_d}
 	gdc \
-%endif
-%if %{build_m2}
-	gm2 \
-%endif
-%if %{build_cobol}
-	gcobol gcobc \
 %endif
 	gcc-ar gcc-nm gcc-ranlib \
     ; do
@@ -673,12 +595,6 @@ for man1 in \
 	gccgo \
 %if %{build_d}
 	gdc \
-%endif
-%if %{build_m2}
-	gm2 \
-%endif
-%if %{build_cobol}
-	gcobol \
 %endif
     ; do
   ln -sf $man1-%{gcc_suffix}.1.gz $RPM_BUILD_ROOT%{_mandir}/man1/$man1.1.gz
@@ -826,21 +742,6 @@ fi
 %doc %{_mandir}/man1/gdc.1.gz
 %endif
 
-%if %{build_m2}
-%files -n gcc%{gccsuffix}-m2
-%defattr(-,root,root)
-%{_bindir}/gm2
-%doc %{_mandir}/man1/gm2.1.gz
-%endif
-
-%if %{build_cobol}
-%files -n gcc%{gccsuffix}-cobol
-%defattr(-,root,root)
-%{_bindir}/gcobol
-%{_bindir}/gcobc
-%doc %{_mandir}/man1/gcobol.1.gz
-%endif
-
 %if %{separate_bi32}
 
 %files -n gcc%{gccsuffix}-32bit
@@ -878,15 +779,7 @@ fi
 %defattr(-,root,root)
 # empty - only for the dependency
 %endif
-
-%if %{build_m2}
-%files -n gcc%{gccsuffix}-m2-32bit
-%defattr(-,root,root)
-# empty - only for the dependency
 %endif
-
-%endif
-
 %if %{separate_bi64}
 
 %files -n gcc%{gccsuffix}-64bit
@@ -925,12 +818,6 @@ fi
 # empty - only for the dependency
 %endif
 
-%if %{build_m2}
-%files -n gcc%{gccsuffix}-m2-64bit
-%defattr(-,root,root)
-# empty - only for the dependency
-%endif
-
 %endif
 
 %files -n libgccjit%{gccsuffix}-devel