From 63b53ebcf29f597b5287c7de02585a774d9733b7 Mon Sep 17 00:00:00 2001
From: wangxiao65 <wang_xiao2@hoperun.com>
Date: Mon, 16 Dec 2024 02:41:09 +0000
Subject: [PATCH 1/3] adapt to new cmake macro

---
 dyninst.spec | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/dyninst.spec b/dyninst.spec
index 7b4b3ca..2f7b351 100644
--- a/dyninst.spec
+++ b/dyninst.spec
@@ -1,6 +1,6 @@
 Name: dyninst
-License: LGPLv2+
-Release: 6
+License: LGPL-2.1-or-later
+Release: 7
 Version: 12.3.0
 Summary: An API for Run-time Code Generation
 ExclusiveArch: x86_64 aarch64
@@ -73,18 +73,27 @@ export CFLAGS CXXFLAGS LDFLAGS
  -DINSTALL_INCLUDE_DIR:PATH=%{_includedir}/dyninst \
  -DINSTALL_CMAKE_DIR:PATH=%{_libdir}/cmake/Dyninst \
  -DCMAKE_BUILD_TYPE=None \
- -DCMAKE_SKIP_RPATH:BOOL=YES \
- .
-%make_build
+ -DCMAKE_SKIP_RPATH:BOOL=YES
+%cmake_build
 
-make DESTDIR=../install install
+# Hack to install dyninst nearby, so the testsuite can use it
+DESTDIR="../install" %__cmake --install "%{__cmake_builddir}"
 find ../install -name '*.cmake' -execdir \
   sed -i -e 's!%{_prefix}!../install&!' '{}' '+'
 sed -i '/libtbb.so/ s/".*usr/"\/usr/' $PWD/../install%{_libdir}/cmake/Dyninst/commonTargets.cmake
 
+cd ../%{testsuite_base}
+%define _smp_mflags -j1
+%cmake \
+ -DDyninst_DIR:PATH=$PWD/../install%{_libdir}/cmake/Dyninst \
+ -DINSTALL_DIR:PATH=%{_libdir}/dyninst/testsuite \
+ -DCMAKE_BUILD_TYPE:STRING=Debug \
+ -DCMAKE_SKIP_RPATH:BOOL=YES
+%cmake_build
+
 %install
 cd %{dyninst_base}
-%make_install
+%cmake_install
 
 mkdir -p %{buildroot}/etc/ld.so.conf.d
 echo "%{_libdir}/dyninst" > %{buildroot}/etc/ld.so.conf.d/%{name}-%{_arch}.conf
@@ -125,6 +134,9 @@ echo "%{_libdir}/dyninst" > %{buildroot}/etc/ld.so.conf.d/%{name}-%{_arch}.conf
 %doc %{dyninst_base}/symtabAPI/doc/symtabAPI.pdf
 
 %changelog
+* Mon Dec 16 2024 wangxiao <wangxiao184@h-partners.com> - 12.3.0-7
+- adapt to new cmake macro
+
 * Tue Aug 20 2024 Chunchun Yang <yangchunchun@cqsoftware.com.cn> - 12.3.0-6
 - Replaced declaration of subpackage with the 'package_help' macro.
 
-- 
Gitee


From 78c17555cebb4e8f390673ec744bced94c5f5c93 Mon Sep 17 00:00:00 2001
From: wangxiao65 <wang_xiao2@hoperun.com>
Date: Mon, 16 Dec 2024 03:59:22 +0000
Subject: [PATCH 2/3] adapt to new cmake macro

---
 dyninst.spec | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/dyninst.spec b/dyninst.spec
index 2f7b351..6835f58 100644
--- a/dyninst.spec
+++ b/dyninst.spec
@@ -82,14 +82,14 @@ find ../install -name '*.cmake' -execdir \
   sed -i -e 's!%{_prefix}!../install&!' '{}' '+'
 sed -i '/libtbb.so/ s/".*usr/"\/usr/' $PWD/../install%{_libdir}/cmake/Dyninst/commonTargets.cmake
 
-cd ../%{testsuite_base}
-%define _smp_mflags -j1
-%cmake \
- -DDyninst_DIR:PATH=$PWD/../install%{_libdir}/cmake/Dyninst \
- -DINSTALL_DIR:PATH=%{_libdir}/dyninst/testsuite \
- -DCMAKE_BUILD_TYPE:STRING=Debug \
- -DCMAKE_SKIP_RPATH:BOOL=YES
-%cmake_build
+#cd ../%{testsuite_base}
+#%define _smp_mflags -j1
+#%cmake \
+# -DDyninst_DIR:PATH=$PWD/../install%{_libdir}/cmake/Dyninst \
+# -DINSTALL_DIR:PATH=%{_libdir}/dyninst/testsuite \
+# -DCMAKE_BUILD_TYPE:STRING=Debug \
+# -DCMAKE_SKIP_RPATH:BOOL=YES
+#%cmake_build
 
 %install
 cd %{dyninst_base}
-- 
Gitee


From 1812339a844f21628d11c7a7c91f6aee7d186d8d Mon Sep 17 00:00:00 2001
From: wangxiao65 <wang_xiao2@hoperun.com>
Date: Mon, 16 Dec 2024 05:58:15 +0000
Subject: [PATCH 3/3] adapt to new cmake macro

---
 dyninst.spec | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/dyninst.spec b/dyninst.spec
index 6835f58..70ccde2 100644
--- a/dyninst.spec
+++ b/dyninst.spec
@@ -1,5 +1,5 @@
 Name: dyninst
-License: LGPL-2.1-or-later
+License: LGPLv2+
 Release: 7
 Version: 12.3.0
 Summary: An API for Run-time Code Generation
@@ -76,21 +76,11 @@ export CFLAGS CXXFLAGS LDFLAGS
  -DCMAKE_SKIP_RPATH:BOOL=YES
 %cmake_build
 
-# Hack to install dyninst nearby, so the testsuite can use it
 DESTDIR="../install" %__cmake --install "%{__cmake_builddir}"
 find ../install -name '*.cmake' -execdir \
-  sed -i -e 's!%{_prefix}!../install&!' '{}' '+'
+  sed -i -e "s!%{_prefix}!$PWD/../install&!" '{}' '+'
 sed -i '/libtbb.so/ s/".*usr/"\/usr/' $PWD/../install%{_libdir}/cmake/Dyninst/commonTargets.cmake
 
-#cd ../%{testsuite_base}
-#%define _smp_mflags -j1
-#%cmake \
-# -DDyninst_DIR:PATH=$PWD/../install%{_libdir}/cmake/Dyninst \
-# -DINSTALL_DIR:PATH=%{_libdir}/dyninst/testsuite \
-# -DCMAKE_BUILD_TYPE:STRING=Debug \
-# -DCMAKE_SKIP_RPATH:BOOL=YES
-#%cmake_build
-
 %install
 cd %{dyninst_base}
 %cmake_install
-- 
Gitee