From e58a8acffac79d55adb2a89712cb3877ec714162 Mon Sep 17 00:00:00 2001 From: wk333 <13474090681@163.com> Date: Thu, 19 Jun 2025 19:21:00 +0800 Subject: [PATCH] Fix build error caused by undefined cmake macro --- wireshark.spec | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/wireshark.spec b/wireshark.spec index d4375ac..2ff499c 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -1,10 +1,9 @@ -%global __cmake_in_source_build 0 %global plugins_version 4.4 Summary: Network traffic analyzer Name: wireshark Version: 4.4.7 -Release: 1 +Release: 2 Epoch: 1 License: BSD-1-Clause AND BSD-2-Clause AND BSD-3-Clause AND MIT AND GPL-2.0-or-later AND LGPL-2.0-or-later AND Zlib AND ISC AND (BSD-3-Clause OR GPL-2.0-only) AND (GPL-2.0-or-later AND Zlib) Url: https://www.wireshark.org/ @@ -99,6 +98,8 @@ and plugins. %build %cmake \ + -S %{_vpath_srcdir} \ + -B %{_vpath_builddir} \ -G "Unix Makefiles" \ -DDISABLE_WERROR=ON \ -DBUILD_wireshark=ON \ @@ -113,11 +114,12 @@ and plugins. -DBUILD_sdjournal=ON \ %{nil} -%cmake_build + +cmake --build %{_vpath_builddir} %{?_smp_mflags} --verbose %install -%cmake_install -%cmake_install --component Development +DESTDIR="%{buildroot}" cmake --install %{_vpath_builddir} +DESTDIR="%{buildroot}" cmake --install %{_vpath_builddir} --component Development mv %{buildroot}%{_datadir}/doc/%{name} ./doc_installed @@ -197,6 +199,9 @@ fi %{_mandir}/man?/* %changelog +* Thu Jun 19 2025 wangkai <13474090681@163.com> - 1:4.4.7-2 +- Fix build error caused by undefined cmake macro + * Thu Jun 05 2025 Funda Wang - 1:4.4.7-1 - update to 4.4.7 - Fix CVE-2025-5601 CVE-2024-11596 -- Gitee