diff --git a/llvm-toolset-18.spec b/llvm-toolset-18.spec
index b1d8d5e53b20b17bd03becc2542173e16e4e39ff..a47a365dea221e2bd3923a6faf80cb594bfe4886 100644
--- a/llvm-toolset-18.spec
+++ b/llvm-toolset-18.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:	3
+Release:	4
 Summary:	The Low Level Virtual Machine
 
 License:	NCSA
@@ -445,13 +445,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}
@@ -493,7 +493,7 @@ Summary: OpenMP runtime for clang
 URL: http://openmp.llvm.org
 
 Requires: %{pkg_name_llvm}-libs%{?_isa} = %{version}-%{release}
-Requires: elfutils-libelf%{?_isa}
+Requires: elfutils-libelf
 
 Provides: libomp(major) = %{maj_ver}
 
@@ -1477,7 +1477,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:
@@ -1493,23 +1493,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
 
@@ -1923,11 +1906,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
 %if %{os_version} > 2203
 %exclude %{_mandir}/man1/llvm-config*
 
@@ -2469,7 +2452,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}
@@ -2788,7 +2771,10 @@ fi
 #endregion files
 
 %changelog
-* Mon Feb 10 2025 liyunfei <liyunfei33@huawei.com> - 18.1.8-3
+* Tue Feb 25 2025 liyunfei <liyunfei33@huawei.com> - 18.1.8-4
+- Bugfixes for 2203 libomp install & package name
+
+* Thu Feb 20 2025 liyunfei <liyunfei33@huawei.com> - 18.1.8-3
 - Bugfixes for 2203 build
 
 * Mon Feb 17 2025 laokz <zhangkai@iscas.ac.cn> - 18.1.8-2