Bugfix for package name

(cherry picked from commit 354d837df087d7719bfa63e2faeef7e00f13242b)

llvm-toolset-19.spec

@@ -114,7 +114,7 @@
 
 #region LLD globals
 
-%global pkg_name_libomp %{?scl_prefix}libomp
+%global pkg_name_libomp %{?scl_prefix}openmp
 
 %global so_suffix %{maj_ver}.%{min_ver}
 
@@ -136,7 +136,7 @@
 #endregion globals
 
 #region MLIR globals
-%global pkg_name_mlir %{?scl_prefix}mlir
+%global pkg_name_mlir %{?scl_prefix}llvm-mlir
 #endregion MLIR globals
 
 #region libcxx globals
@@ -149,7 +149,7 @@
 #region main package
 Name:		  llvm-toolset-%{maj_ver}
 Version:	%{maj_ver}.%{min_ver}.%{patch_ver}
-Release:	1
+Release:	2
 Summary:	The Low Level Virtual Machine
 
 License:	NCSA
@@ -447,13 +447,13 @@ Development header files for clang tools.
 # Put git-clang-format in its own package, because it Requires git
 # and we don't want to force users to install all those dependenices if they
 # just want clang.
-%package -n %{?scl_prefix}git-clang-format%{?pkg_suffix}
+%package -n %{?scl_prefix}git-clang-format
 Summary:	Integration of clang-format for git
 Requires:	%{pkg_name_clang}-tools-extra = %{version}-%{release}
 Requires:	git
 Requires:	python3
 
-%description -n %{?scl_prefix}git-clang-format%{pkg_suffix}
+%description -n %{?scl_prefix}git-clang-format
 clang-format integration for git.
 
 %if %{with sys_llvm}
@@ -1479,7 +1479,7 @@ install -m 0755 ../llvm-compat-libs/lib/liblldb.so.%{compat_maj_ver}* %{buildroo
 cat <<EOF > %{buildroot}%{_scl_scripts}/enable
 # General environment variables
 export PATH=%{install_bindir}\${PATH:+:\${PATH}}
-export MANPATH=%{install_datadir}:\${MANPATH}
+export MANPATH=%{_mandir}:\${MANPATH}
 export PCP_DIR=%{_scl_root}
 
 # bz847911 workaround:
@@ -1496,22 +1496,6 @@ export LD_LIBRARY_PATH=%{_scl_root}\$rpmlibdir\$rpmlibdir32:%{_scl_root}\$rpmlib
 EOF
 chmod 755 %{buildroot}%{_scl_scripts}/enable
 
-cat <<EOF > %{buildroot}%{install_bindir}/sudo
-#! /bin/sh
-# TODO: parse & pass-through sudo options from \$@
-sudo_options="-E"
-
-for arg in "\$@"
-do
-   case "\$arg" in
-    *\'*)
-      arg=`echo "\$arg" | sed "s/'/'\\\\\\\\''/g"` ;;
-   esac
-   cmd_options="\$cmd_options '\$arg'"
-done
-exec /usr/bin/sudo \$sudo_options LD_LIBRARY_PATH=\$LD_LIBRARY_PATH PATH=\$PATH scl enable %{scl} "\$cmd_options"
-EOF
-chmod 775 %{buildroot}%{install_bindir}/sudo
 %endif
 #endregion install
 
@@ -1925,11 +1909,11 @@ fi
 #endregion LLVM lit files
 
 #region LLVM files
+%files -n llvm-toolset-%{maj_ver}
+%{_scl_scripts}/enable
 
 %files -n %{pkg_name_llvm}
 %license llvm/LICENSE.TXT
-%{_scl_scripts}/enable
-%{install_bindir}/sudo
 %exclude %{_mandir}/man1/llvm-config*
 
 %{_mandir}/man1/bugpoint%{exec_suffix}.1.gz
@@ -2474,7 +2458,7 @@ fi
 %license clang-tools-extra/LICENSE.TXT
 %{install_includedir}/clang-tidy/
 
-%files -n %{?scl_prefix}git-clang-format%{pkg_suffix}
+%files -n %{?scl_prefix}git-clang-format
 %license clang/LICENSE.TXT
 %{install_bindir}/git-clang-format
 %if %{without sys_llvm}
@@ -2800,5 +2784,8 @@ fi
 #endregion files
 
 %changelog
+* Tue Feb 25 2025 liyunfei <liyunfei33@huawei.com> - 19.1.7-2
+- Bugfix for package name
+
 * Mon Feb 10 2025 liyunfei <liyunfei33@huawei.com> - 19.1.7-1
 - Package init