diff --git a/0000-libdir-suffix.patch b/0000-libdir-suffix.patch
index bb8677a48584b4c0f00eebca5405bfe56212a644..cbeba55e2b3dcc3dd97518565deb5bdba913a3af 100644
--- a/0000-libdir-suffix.patch
+++ b/0000-libdir-suffix.patch
@@ -1,39 +1,39 @@
-From 4255ea7e6f7d6c5a4c7eab290eb6eec7a66b017c Mon Sep 17 00:00:00 2001
-From: luofeng <luofeng13@huawei.com>
-Date: Wed, 13 Mar 2024 17:18:56 +0800
-Subject: [PATCH] libdir suffix
-
----
- CMakeLists.txt                       | 2 +-
- runtime/libpgmath/lib/CMakeLists.txt | 4 ++--
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 2db7f40..40f3b58 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -120,7 +120,7 @@ if( CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR )
-   set(LLVM_MAIN_INCLUDE_DIR ${INCLUDE_DIR} CACHE PATH "Path to llvm/include")
-   set(LLVM_BINARY_DIR ${LLVM_OBJ_ROOT} CACHE PATH "Path to LLVM build tree")
- 
--  set(LLVM_CMAKE_PATH "${LLVM_BINARY_DIR}/lib/cmake/llvm"
-+  set(LLVM_CMAKE_PATH "${LLVM_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm"
-      CACHE PATH "Path to LLVM cmake modules")
-   set(LLVMCONFIG_FILE "${LLVM_CMAKE_PATH}/LLVMConfig.cmake")
-   if(EXISTS ${LLVMCONFIG_FILE})
-diff --git a/runtime/libpgmath/lib/CMakeLists.txt b/runtime/libpgmath/lib/CMakeLists.txt
-index c43b315..c39b3b0 100644
---- a/runtime/libpgmath/lib/CMakeLists.txt
-+++ b/runtime/libpgmath/lib/CMakeLists.txt
-@@ -266,6 +266,6 @@ else()
-     set_target_properties(${LIBPGMATH_LIBRARY_NAME}_static PROPERTIES OUTPUT_NAME ${LIBPGMATH_LIBRARY_NAME})
- endif()
- install(TARGETS ${LIBPGMATH_LIBRARY_NAME}
--  LIBRARY DESTINATION lib)
-+  LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX})
- install(TARGETS ${LIBPGMATH_LIBRARY_NAME}_static
--  ARCHIVE DESTINATION lib)
-+  ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX})
--- 
-2.19.1
-
+From 4255ea7e6f7d6c5a4c7eab290eb6eec7a66b017c Mon Sep 17 00:00:00 2001
+From: luofeng <luofeng13@huawei.com>
+Date: Wed, 13 Mar 2024 17:18:56 +0800
+Subject: [PATCH] libdir suffix
+
+---
+ CMakeLists.txt                       | 2 +-
+ runtime/libpgmath/lib/CMakeLists.txt | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 2db7f40..40f3b58 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -120,7 +120,7 @@ if( CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR )
+   set(LLVM_MAIN_INCLUDE_DIR ${INCLUDE_DIR} CACHE PATH "Path to llvm/include")
+   set(LLVM_BINARY_DIR ${LLVM_OBJ_ROOT} CACHE PATH "Path to LLVM build tree")
+ 
+-  set(LLVM_CMAKE_PATH "${LLVM_BINARY_DIR}/lib/cmake/llvm"
++  set(LLVM_CMAKE_PATH "${LLVM_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm"
+      CACHE PATH "Path to LLVM cmake modules")
+   set(LLVMCONFIG_FILE "${LLVM_CMAKE_PATH}/LLVMConfig.cmake")
+   if(EXISTS ${LLVMCONFIG_FILE})
+diff --git a/runtime/libpgmath/lib/CMakeLists.txt b/runtime/libpgmath/lib/CMakeLists.txt
+index c43b315..c39b3b0 100644
+--- a/runtime/libpgmath/lib/CMakeLists.txt
++++ b/runtime/libpgmath/lib/CMakeLists.txt
+@@ -266,6 +266,6 @@ else()
+     set_target_properties(${LIBPGMATH_LIBRARY_NAME}_static PROPERTIES OUTPUT_NAME ${LIBPGMATH_LIBRARY_NAME})
+ endif()
+ install(TARGETS ${LIBPGMATH_LIBRARY_NAME}
+-  LIBRARY DESTINATION lib)
++  LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX})
+ install(TARGETS ${LIBPGMATH_LIBRARY_NAME}_static
+-  ARCHIVE DESTINATION lib)
++  ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX})
+-- 
+2.19.1
+
diff --git a/0001-llvm-package-minimize.patch b/0001-llvm-package-minimize.patch
index 66986a77b1444df77404889cab26f96edf83fa0c..da02a0c3ec9f4f30b5ac9b04fdf8d0369f5b7e0e 100644
--- a/0001-llvm-package-minimize.patch
+++ b/0001-llvm-package-minimize.patch
@@ -1,40 +1,40 @@
-From 416ad88e6496c2611a6c88bc4ddaadb04b463225 Mon Sep 17 00:00:00 2001
-From: luofeng <luofeng13@huawei.com>
-Date: Sun, 28 Apr 2024 20:55:34 +0800
-Subject: [PATCH] llvm package minimize
-
----
- llvm/cmake/modules/AddLLVM.cmake  | 3 ++-
- llvm/cmake/modules/CMakeLists.txt | 2 +-
- 2 files changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/llvm/cmake/modules/AddLLVM.cmake b/llvm/cmake/modules/AddLLVM.cmake
-index 230620c..82153aa 100644
---- a/llvm/cmake/modules/AddLLVM.cmake
-+++ b/llvm/cmake/modules/AddLLVM.cmake
-@@ -1349,7 +1349,8 @@ macro(llvm_add_tool project name)
-   else()
-     add_llvm_executable(${name} ${ARGN})
- 
--    if ( ${name} IN_LIST LLVM_TOOLCHAIN_TOOLS OR NOT LLVM_INSTALL_TOOLCHAIN_ONLY)
-+    if ( ${name} IN_LIST LLVM_TOOLCHAIN_TOOLS OR NOT LLVM_INSTALL_TOOLCHAIN_ONLY  OR
-+         (LLVM_ENABLE_CLASSIC_FLANG AND ${name} STREQUAL "llvm-config"))
-       if( LLVM_BUILD_TOOLS )
-         get_target_export_arg(${name} LLVM export_to_llvmexports)
-         install(TARGETS ${name}
-diff --git a/llvm/cmake/modules/CMakeLists.txt b/llvm/cmake/modules/CMakeLists.txt
-index d99af79..6a7f37e 100644
---- a/llvm/cmake/modules/CMakeLists.txt
-+++ b/llvm/cmake/modules/CMakeLists.txt
-@@ -160,7 +160,7 @@ configure_file(
-   ${llvm_cmake_builddir}/LLVMConfigVersion.cmake
-   @ONLY)
- 
--if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY)
-+if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY OR LLVM_ENABLE_CLASSIC_FLANG)
-   install_distribution_exports(LLVM)
- 
-   install(FILES
--- 
-2.19.1
-
+From 416ad88e6496c2611a6c88bc4ddaadb04b463225 Mon Sep 17 00:00:00 2001
+From: luofeng <luofeng13@huawei.com>
+Date: Sun, 28 Apr 2024 20:55:34 +0800
+Subject: [PATCH] llvm package minimize
+
+---
+ llvm/cmake/modules/AddLLVM.cmake  | 3 ++-
+ llvm/cmake/modules/CMakeLists.txt | 2 +-
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/llvm/cmake/modules/AddLLVM.cmake b/llvm/cmake/modules/AddLLVM.cmake
+index 230620c..82153aa 100644
+--- a/llvm/cmake/modules/AddLLVM.cmake
++++ b/llvm/cmake/modules/AddLLVM.cmake
+@@ -1349,7 +1349,8 @@ macro(llvm_add_tool project name)
+   else()
+     add_llvm_executable(${name} ${ARGN})
+ 
+-    if ( ${name} IN_LIST LLVM_TOOLCHAIN_TOOLS OR NOT LLVM_INSTALL_TOOLCHAIN_ONLY)
++    if ( ${name} IN_LIST LLVM_TOOLCHAIN_TOOLS OR NOT LLVM_INSTALL_TOOLCHAIN_ONLY  OR
++         (LLVM_ENABLE_CLASSIC_FLANG AND ${name} STREQUAL "llvm-config"))
+       if( LLVM_BUILD_TOOLS )
+         get_target_export_arg(${name} ${project} export_to_llvmexports)
+         install(TARGETS ${name}
+diff --git a/llvm/cmake/modules/CMakeLists.txt b/llvm/cmake/modules/CMakeLists.txt
+index d99af79..6a7f37e 100644
+--- a/llvm/cmake/modules/CMakeLists.txt
++++ b/llvm/cmake/modules/CMakeLists.txt
+@@ -160,7 +160,7 @@ configure_file(
+   ${llvm_cmake_builddir}/LLVMConfigVersion.cmake
+   @ONLY)
+ 
+-if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY)
++if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY OR LLVM_ENABLE_CLASSIC_FLANG)
+   install_distribution_exports(LLVM)
+ 
+   install(FILES
+-- 
+2.19.1
+
diff --git a/classic-flang.spec b/classic-flang.spec
index 3b03996186fec4847e255a4219e78a0e22d075a4..eca2f8b9edaf7b0dbb4dfaf2f4de0af66f461811 100644
--- a/classic-flang.spec
+++ b/classic-flang.spec
@@ -29,7 +29,7 @@
 
 Name:    %{pkg_name}
 Version: %{flang_version}
-Release: 2
+Release: 4
 Summary: a Fortran language front-end designed for integration with LLVM
 
 License: Apache-2.0 WITH LLVM-exception
@@ -71,7 +71,7 @@ LLVM bin include lib files.
 %autosetup -n classic-flang-%{source_commit_id} -p1
 
 # build and install llvm-project
-git clone https://gitee.com/openeuler/llvm-project.git
+git clone --depth=1 https://gitee.com/openeuler/llvm-project.git
 cd llvm-project/
 cat  %{_sourcedir}/0001-llvm-package-minimize.patch | patch -p1 -F1
 mkdir build
@@ -220,6 +220,12 @@ popd
 %exclude  %{install_prefix}/bin/llvm-symbolizer
 
 %changelog
+* Wed Aug 20 2025 eastb233 <xiezhiheng@huawei.com> - 17.0.6-4
+- Solve patch confliction
+
+* Mon Sep 24 2024 luofeng <luofeng13@huawei.com> - 17.0.6-3
+- Bugfix: Fix git clone failing due to the llvm-project file being too large.
+
 * Mon Apr 29 2024 luofeng <luofeng13@huawei.com> - 17.0.6-2
 - Add usage documents