From 4729361bb954ab4c7bb8645e60b7d4ec28138dcc Mon Sep 17 00:00:00 2001
From: weidongkl <weidong@uniontech.com>
Date: Wed, 6 Nov 2024 20:51:25 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=BA=93=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E4=B8=8D=E5=AD=98=E5=9C=A8=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: weidongkl <weidong@uniontech.com>
---
 .idea/workspace.xml | 44 ++++++++++++++++++++++++++++++++++++++++++++
 valgrind.spec       | 14 +++++---------
 2 files changed, 49 insertions(+), 9 deletions(-)
 create mode 100644 .idea/workspace.xml

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
new file mode 100644
index 0000000..47927bf
--- /dev/null
+++ b/.idea/workspace.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="AutoImportSettings">
+    <option name="autoReloadType" value="SELECTIVE" />
+  </component>
+  <component name="ChangeListManager">
+    <list default="true" id="7e324d2a-4cf9-427e-b20c-7be5774492e7" name="Changes" comment="">
+      <change beforePath="$PROJECT_DIR$/valgrind.spec" beforeDir="false" afterPath="$PROJECT_DIR$/valgrind.spec" afterDir="false" />
+    </list>
+    <option name="SHOW_DIALOG" value="false" />
+    <option name="HIGHLIGHT_CONFLICTS" value="true" />
+    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
+    <option name="LAST_RESOLUTION" value="IGNORE" />
+  </component>
+  <component name="Git.Settings">
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
+  </component>
+  <component name="MarkdownSettingsMigration">
+    <option name="stateVersion" value="1" />
+  </component>
+  <component name="ProjectId" id="2oTcXFnZpwBPAn2BrfGKOGhJfcg" />
+  <component name="ProjectViewState">
+    <option name="hideEmptyMiddlePackages" value="true" />
+    <option name="showLibraryContents" value="true" />
+  </component>
+  <component name="PropertiesComponent"><![CDATA[{
+  "keyToString": {
+    "RunOnceActivity.OpenProjectViewOnStart": "true",
+    "RunOnceActivity.ShowReadmeOnStart": "true",
+    "last_opened_file_path": "/home/ut001996@uos/Desktop/repo/work/openeuler/valgrind"
+  }
+}]]></component>
+  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
+  <component name="TaskManager">
+    <task active="true" id="Default" summary="Default task">
+      <changelist id="7e324d2a-4cf9-427e-b20c-7be5774492e7" name="Changes" comment="" />
+      <created>1730897043148</created>
+      <option name="number" value="Default" />
+      <option name="presentableId" value="Default" />
+      <updated>1730897043148</updated>
+    </task>
+    <servers />
+  </component>
+</project>
\ No newline at end of file
diff --git a/valgrind.spec b/valgrind.spec
index f27419f..d8f61fc 100644
--- a/valgrind.spec
+++ b/valgrind.spec
@@ -13,7 +13,7 @@
 
 Name:           valgrind
 Version:        3.16.0
-Release:        5
+Release:        6
 Epoch:          1
 Summary:        An instrumentation framework for building dynamic analysis tools
 License:        GPLv2+
@@ -68,13 +68,6 @@ OPTFLAGS="`echo " $optflags " | sed 's/ -m\(64\|3[21]\) / /g;s/ -fexceptions / /
 
 pushd %{buildroot}%{_libdir}/valgrind/
 rm -f *.supp.in *.a
-%if "%{arch_old_val}" != ""
-rm -f *-%{arch_old_val}-* || :
-for i in *-%{arch_val}-*; do
-  j=`echo $i | sed 's/-%{arch_val}-/-%{arch_old_val}-/'`
-  ln -sf ../../lib/valgrind/$j $j
-done
-%endif
 popd
 
 pushd %{buildroot}%{_includedir}/%{name}
@@ -90,7 +83,7 @@ popd
 %{_libdir}/%{name}/*[^ao]
 %attr(0755,root,root) %{_libdir}/valgrind/vgpreload*-%{arch_val}-*so
 %if "%{arch_old_val}" != ""
-%{_libdir}/%{name}/vgpreload*-%{arch_old_val}-*so
+%{_libdir}/%{name}/vgpreload*-*-*so
 %endif
 %{_libexecdir}/valgrind/*
 
@@ -103,6 +96,9 @@ popd
 %{_mandir}/man1/*
 
 %changelog
+* Wed Nov 06 2024 weidongkl <weidong@uniontech.com> - 1:3.16.0-6
+-  fix: https://gitee.com/src-openeuler/valgrind/issues/IB2K4V
+
 * Mon Dec 18 2023 wangshuo <wangshuo@kylinos.cn> - 1:3.16.0-5
 - Type:bugfix
 - ID:NA
-- 
Gitee