From 65b4317cf256e85635484f136437fe2917d7bc2d Mon Sep 17 00:00:00 2001 From: Siddhesh Poyarekar Date: Mon, 5 May 2025 21:28:42 -0400 Subject: [PATCH] Split out a devel package That should break the circular dependency with gts-gcc and gts-binutils. Related: RHEL-81745 Resolves: RHEL-88742 --- gcc-toolset-15.spec | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/gcc-toolset-15.spec b/gcc-toolset-15.spec index 2357196..d64c29c 100644 --- a/gcc-toolset-15.spec +++ b/gcc-toolset-15.spec @@ -27,14 +27,13 @@ BuildRequires: scl-utils-build %else %include %{_sourcedir}/macros.gts -Conflicts: scl-utils-build %endif %{?scl_package:%scl_package %scl} Summary: Package that installs %scl Name: %scl_name Version: %{gts_ver}.0 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: Applications/File BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -91,6 +90,14 @@ Requires(postun): libselinux policycoreutils-python %description runtime Package shipping essential scripts to work with %scl Software Collection. +%else +%package devel +Summary: Scripts needed to build GCC Toolset %gts_ver. +Group: Applications/File +Conflicts: scl-utils-build + +%description devel +Package shipping scripts to build GCC Toolset %gts_ver. %endif %prep @@ -223,7 +230,6 @@ install -p -m 644 %{?scl_name}.7 %{buildroot}%{_mandir}/man7/ %{_mandir}/man7/%{?scl_name}.* %if %have_scl_utils == 0 %{_root_sysconfdir}/rpm/macros.%{scl}-enable -%{_root_sysconfdir}/rpm/macros.%{scl}-build %endif %if %have_scl_utils @@ -252,9 +258,16 @@ if [ $1 = 0 ]; then /usr/sbin/semanage fcontext -d %{_scl_root} [ -d %{_scl_root} ] && restorecon -R %{_scl_root} || : fi +%else +%files devel +%{_root_sysconfdir}/rpm/macros.%{scl}-build %endif %changelog +* Mon May 5 2025 Siddhesh Poyarekar - 15.0-2 +- Split out a devel package to break the dependency look with gts-gcc and + gts-binutils. + * Mon May 5 2025 Siddhesh Poyarekar - 15.0-1 - Drop scl-utils dependency on c10s and later.