Drop the sudo wrapper script

Resolves: RHEL-90064
This commit is contained in:
Siddhesh Poyarekar 2025-05-21 11:23:38 -04:00 committed by Siddhesh Poyarekar
parent 7ce35f7e4f
commit 085aa213f8
2 changed files with 6 additions and 12 deletions

View File

@ -8,13 +8,12 @@ BuildRequires: scl-utils-build
Summary: Package that installs %scl
Name: %scl_name
Version: 14.0
Release: 0%{?dist}
Release: 1%{?dist}
License: GPLv2+
Group: Applications/File
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: README
Source1: sudo.sh
Source2: gts-annobin-plugin-select.sh
Source1: gts-annobin-plugin-select.sh
Requires: %{scl_prefix}runtime
Requires: %{scl_prefix}gcc %{scl_prefix}gcc-c++ %{scl_prefix}gcc-gfortran
@ -104,12 +103,6 @@ export LD_LIBRARY_PATH=%{_scl_root}\$rpmlibdir\$rpmlibdir64\$rpmlibdir32\${LD_LI
export PKG_CONFIG_PATH=%{_libdir}/pkgconfig\${PKG_CONFIG_PATH:+:\${PKG_CONFIG_PATH}}
EOF
# Sudo script
# ===========
cat <<'EOF' > sudo
%{expand:%(cat %{SOURCE1})}
EOF
%install
(%{scl_install})
@ -128,7 +121,6 @@ install -d -m 755 %{buildroot}%{_scl_scripts}
install -p -m 755 enable %{buildroot}%{_scl_scripts}/
install -d -m 755 %{buildroot}%{_scl_scripts}
install -p -m 755 sudo %{buildroot}%{_bindir}/
# Other directories that should be owned by the runtime
install -d -m 755 %{buildroot}%{_datadir}/appdata
@ -143,7 +135,7 @@ install -p -m 644 %{?scl_name}.7 %{buildroot}%{_mandir}/man7/
# Install the plugin selector trigger script.
mkdir -p %{buildroot}%{rrcdir}
install -p -m 755 %{SOURCE2} %{buildroot}%{rrcdir}/
install -p -m 755 %{SOURCE1} %{buildroot}%{rrcdir}/
# This trigger is used to decide which version of the annobin plugin for gcc
# should be used. See comments in the script for full details.
@ -189,6 +181,9 @@ if [ $1 = 0 ]; then
fi
%changelog
* Wed May 21 2025 Siddhesh Poyarekar <siddhesh@redhat.com> - 14.0-1
- Drop the sudo wrapper script (RHEL-90064)
* Mon Apr 29 2024 Marek Polacek <polacek@redhat.com> - 14.0-0
- update to GTS 14 (RHEL-34596)

View File

@ -1,3 +1,2 @@
SHA512 (gts-annobin-plugin-select.sh) = f5e5f4dc054bdd09c6d185bc3c671376ff8b825c8fa3f2969e25e10358405aa105f74154c63b6dc025cbe7e09eb24693664048685aaf481cc2a65d12ad9476b8
SHA512 (README) = a4ed9ea6bb2cdc32cc908cdaf56faf6a813712c2b807a31e286a5fa2faead5285be025363b66d699e30afe34213c66421b76321ef0ca7b57e5e3c5610d32c3c8
SHA512 (sudo.sh) = 1378412b39b31f1f76b9d7b9fce5ea679e764a2fd85804fbc3b9ce1c8b5e9b1694be854b4407d1b5dba229763127c9cc64bc09bdf87b384c93536b97d001520d