diff --git a/.fmf/version b/.fmf/version deleted file mode 100644 index d00491f..0000000 --- a/.fmf/version +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/README b/SOURCES/README similarity index 62% rename from README rename to SOURCES/README index c5e6e27..d322962 100644 --- a/README +++ b/SOURCES/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} 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 - Run an interactive shell wherein %{scl_name} is enabled. - -%{scl_name}-env command --arg +scl enable %{scl_name} '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 . diff --git a/enable.in b/SOURCES/enable.in similarity index 100% rename from enable.in rename to SOURCES/enable.in diff --git a/SOURCES/gcc-toolset-env.in b/SOURCES/gcc-toolset-env.in new file mode 100644 index 0000000..7a96adb --- /dev/null +++ b/SOURCES/gcc-toolset-env.in @@ -0,0 +1,11 @@ +# Environment wrapper for GCC Toolset %{gts_ver} + +source %{_root_prefix}/lib/gcc-toolset/%{gts_ver}-env.source + +if [ -z $1 ]; then + cmd="/bin/sh" +else + cmd=$* +fi + +exec $cmd diff --git a/gts-annobin-plugin-select.sh b/SOURCES/gts-annobin-plugin-select.sh similarity index 100% rename from gts-annobin-plugin-select.sh rename to SOURCES/gts-annobin-plugin-select.sh diff --git a/macros.gts b/SOURCES/macros.gts similarity index 100% rename from macros.gts rename to SOURCES/macros.gts diff --git a/gcc-toolset-15.spec b/SPECS/gcc-toolset-15.spec similarity index 90% rename from gcc-toolset-15.spec rename to SPECS/gcc-toolset-15.spec index 26310a7..c1e810c 100644 --- a/gcc-toolset-15.spec +++ b/SPECS/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 - 15.0-11 -- Bump again for rebuild (RHEL-96490) - -* Thu Jul 3 2025 Siddhesh Poyarekar - 15.0-10 -- Bump for rebuild (RHEL-96490) - * Fri Jun 20 2025 Siddhesh Poyarekar - 15.0-9 -- Compress man page and fix its name (RHEL-96490) - -* Wed Jun 11 2025 Siddhesh Poyarekar - 15.0-8 -- Fix typo in gcc-toolset-env (RHEL-94760) +- Compress man page and fix its name (RHEL-98731) * Tue Jun 10 2025 Siddhesh Poyarekar - 15.0-7 -- Man page and documentation updates (RHEL-95996) -- Support scl-style quoted invocation (RHEL-94760) +- Man page and documentation updates (RHEL-96025) * Thu Jun 5 2025 Siddhesh Poyarekar - 15.0-6 - Split out scripts into a -runtime package on RHEL10 (RHEL-94841) -* Wed Jun 4 2025 Siddhesh Poyarekar - 15.0-5 -- Fix quoting and other issues in gcc-toolset-env script (RHEL-94760) - -* Thu May 15 2025 Siddhesh Poyarekar - 15.0-4 -- New script to replace scl-enable (RHEL-88743). +* Tue May 20 2025 Siddhesh Poyarekar - 15.0-4 +- New script to replace scl-enable (RHEL-91829). * Thu May 8 2025 Siddhesh Poyarekar - 15.0-3 - Drop the sudo wrapper script. @@ -300,5 +287,5 @@ fi * Mon May 5 2025 Siddhesh Poyarekar - 15.0-1 - Drop scl-utils dependency on c10s and later. -* Wed Apr 30 2025 Siddhesh Poyarekar - 15.0-0 -- new package (RHELPLAN-171631) +* Mon Apr 14 2025 Marek Polacek - 15.0-0 +- new package (RHELPLAN-171604) diff --git a/gating.yaml b/gating.yaml deleted file mode 100644 index af54d4f..0000000 --- a/gating.yaml +++ /dev/null @@ -1,7 +0,0 @@ ---- !Policy -product_versions: - - rhel-10 -decision_context: osci_compose_gate -rules: - - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional} - - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional} diff --git a/gcc-toolset-env.in b/gcc-toolset-env.in deleted file mode 100644 index 0e129fa..0000000 --- a/gcc-toolset-env.in +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/sh -# Environment wrapper for GCC Toolset %{gts_ver} - -. %{_root_prefix}/lib/gcc-toolset/%{gts_ver}-env.source - -if [ -z "$1" ]; then - exec /usr/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 "$@" -fi diff --git a/plans/tier0.fmf b/plans/tier0.fmf deleted file mode 100644 index bcbda9c..0000000 --- a/plans/tier0.fmf +++ /dev/null @@ -1,28 +0,0 @@ -# Tier 0 test plan. It's actually Tier 1 -# - limited to its public part -# - executed on the architecture at hand -# When run by osci.tier0 on CentOS Stream or RHEL, it receives the following -# context: -# arch=x86_64 (the architecture at hand, currently OSCI uses just x86_64) -# distro=rhel. (even for CentOS Stream builds) -# trigger=build - -summary: Tier 0 test plan -context: - component: gcc-toolset-15 -discover: - - name: collect_info - how: shell - tests: - - name: /info/rpms - test: rpm -qa --last - - name: public_tests - how: fmf - url: https://gitlab.com/redhat/centos-stream/tests/gcc-toolset-metapackage.git - filter: tier:1 -execute: - how: tmt -prepare+: - how: shell -environment+: - WITH_SCL: gcc-toolset-15-env diff --git a/sources b/sources deleted file mode 100644 index e69de29..0000000