README

@@ -1,28 +1,29 @@
 Package %{scl_name} is the main package for Red Hat GCC
 Toolset 15.  By installing the %{scl_name} package, you will get
 the working set of packages that are included in Red Hat GCC
-Toolset 15, which includes the compiler and linker.
+Toolset 15, which includes development and debugging tools.
 
-Usage: %{scl_name}-env [command]
+Usage: scl enable %{scl} <command>
 
 Red Hat GCC Toolset allows you to build and execute applications
 which are not located in the filesystem root hierarchy, but are
 stored in an alternative location, which is %{_scl_root} in case
-of %{scl_name}.
+of the %{scl_name} collection.
 
 Examples:
-%{scl_name}-env
+scl enable %{scl_name} 'command --arg'
-  Run an interactive shell wherein %{scl_name} is enabled.
-
-%{scl_name}-env command --arg
   Run a specific command with the argument --arg within the %{scl_name}
   Red Hat GCC Toolset environment.
 
-%{scl_name}-env gcc
+scl enable %{scl_name} 'gcc'
   Run GCC from the %{scl_name} Red Hat GCC Toolset.
 
-%{scl_name}-env man gcc
+scl enable %{scl_name} 'bash'
+  Run an interactive shell wherein the %{scl_name} software collection
+  is enabled.
+
+scl enable %{scl_name} 'man gcc'
   Show man pages for the gcc command, which is a part of the
   %{scl_name} Red Hat GCC Toolset.
 
-Report bugs to <%{dist_bug_report_url}>.
+Report bugs to <https://issues.redhat.com>.

gating.yaml

@@ -1,6 +1,6 @@
 --- !Policy
 product_versions:
-  - rhel-10
+  - rhel-8
 decision_context: osci_compose_gate
 rules:
   - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.gate-build-fast-lane.functional}

gcc-toolset-15.spec

@@ -37,7 +37,7 @@ BuildRequires: scl-utils-build
 Summary: Package that installs %scl
 Name: %scl_name
 Version: %{gts_ver}.0
-Release: 11%{?dist}
+Release: 9%{?dist}
 License: GPLv2+
 Group: Applications/File
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -265,30 +265,17 @@ fi
 %endif
 
 %changelog
-* Thu Jul  3 2025 Siddhesh Poyarekar <siddhesh@redhat.com> - 15.0-11
-- Bump again for rebuild (RHEL-96490)
-
-* Thu Jul  3 2025 Siddhesh Poyarekar <siddhesh@redhat.com> - 15.0-10
-- Bump for rebuild (RHEL-96490)
-
 * Fri Jun 20 2025 Siddhesh Poyarekar <siddhesh@redhat.com> - 15.0-9
-- Compress man page and fix its name (RHEL-96490)
+- Compress man page and fix its name (RHEL-98731)
-
-* Wed Jun 11 2025 Siddhesh Poyarekar <siddhesh@redhat.com> - 15.0-8
-- Fix typo in gcc-toolset-env (RHEL-94760)
 
 * Tue Jun 10 2025 Siddhesh Poyarekar <siddhesh@redhat.com> - 15.0-7
-- Man page and documentation updates (RHEL-95996)
+- Man page and documentation updates (RHEL-96025)
-- Support scl-style quoted invocation (RHEL-94760)
 
 * Thu Jun  5 2025 Siddhesh Poyarekar <siddhesh@redhat.com> - 15.0-6
 - Split out scripts into a -runtime package on RHEL10 (RHEL-94841)
 
-* Wed Jun  4 2025 Siddhesh Poyarekar <siddhesh@redhat.com> - 15.0-5
+* Tue May 20 2025 Siddhesh Poyarekar <siddhesh@redhat.com> - 15.0-4
-- Fix quoting and other issues in gcc-toolset-env script (RHEL-94760)
+- New script to replace scl-enable (RHEL-91829).
-
-* Thu May 15 2025 Siddhesh Poyarekar <siddhesh@redhat.com> - 15.0-4
-- New script to replace scl-enable (RHEL-88743).
 
 * Thu May  8 2025 Siddhesh Poyarekar <siddhesh@redhat.com> - 15.0-3
 - Drop the sudo wrapper script.
@@ -300,5 +287,5 @@ fi
 * Mon May  5 2025 Siddhesh Poyarekar <siddhesh@redhat.com> - 15.0-1
 - Drop scl-utils dependency on c10s and later.
 
-* Wed Apr 30 2025 Siddhesh Poyarekar <siddhesh@redhat.com> - 15.0-0
+* Mon Apr 14 2025 Marek Polacek <polacek@redhat.com> - 15.0-0
-- new package (RHELPLAN-171631)
+- new package (RHELPLAN-171604)

gcc-toolset-env.in

@@ -1,14 +1,11 @@
-#!/usr/bin/sh
 # Environment wrapper for GCC Toolset %{gts_ver}
 
-. %{_root_prefix}/lib/gcc-toolset/%{gts_ver}-env.source
+source %{_root_prefix}/lib/gcc-toolset/%{gts_ver}-env.source
 
-if [ -z "$1" ]; then
+if [ -z $1 ]; then
-  exec /usr/bin/sh
+  cmd="/bin/sh"
-# Compatibility with `scl enable`, where the entire command shows up as a
-# single argument.
-elif [ -z "$2" ]; then
-  exec sh -c "$@"
 else
-  exec "$@"
+  cmd=$*
 fi
+
+exec $cmd

plans/tier0.fmf

@@ -25,4 +25,5 @@ execute:
 prepare+:
   how: shell
 environment+:
-  WITH_SCL: gcc-toolset-15-env
+  COLLECTIONS: gcc-toolset-15
+  WITH_SCL: "scl enable gcc-toolset-15"