From 85d9580754823eed1055639abd83a27cc0a76ed5 Mon Sep 17 00:00:00 2001 From: Michal Ruprich Date: Sun, 11 Feb 2024 17:11:06 +0100 Subject: [PATCH] Making sure that wireshark.pc is created and installed --- wireshark-0008-pkgconfig.patch | 14 ++++++++++++++ wireshark.spec | 7 ++++++- 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 wireshark-0008-pkgconfig.patch diff --git a/wireshark-0008-pkgconfig.patch b/wireshark-0008-pkgconfig.patch new file mode 100644 index 0000000..3ef90b0 --- /dev/null +++ b/wireshark-0008-pkgconfig.patch @@ -0,0 +1,14 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 27fa752..7bdc036 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -4037,9 +4037,6 @@ install( + "${CMAKE_BINARY_DIR}/wireshark.pc" + DESTINATION + ${CMAKE_INSTALL_LIBDIR}/pkgconfig +- COMPONENT +- "Development" +- EXCLUDE_FROM_ALL + ) + + install( diff --git a/wireshark.spec b/wireshark.spec index 14dbdf7..21942aa 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -6,7 +6,7 @@ Summary: Network traffic analyzer Name: wireshark Version: 4.2.2 -Release: 1%{?dist} +Release: 2%{?dist} 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: http://www.wireshark.org/ @@ -27,6 +27,7 @@ Patch5: wireshark-0005-Fix-paths-in-a-wireshark.desktop-file.patch # Fedora-specific Patch6: wireshark-0006-Move-tmp-to-var-tmp.patch Patch7: wireshark-0007-cmakelists.patch +Patch8: wireshark-0008-pkgconfig.patch #install tshark together with wireshark GUI Requires: %{name}-cli = %{epoch}:%{version}-%{release} @@ -275,8 +276,12 @@ fi %doc doc/README.* ChangeLog %{_includedir}/wireshark %{_libdir}/lib*.so +%{_libdir}/pkgconfig/%{name}.pc %changelog +* Sun Feb 11 2024 Michal Ruprich - 1:4.2.2-2 +- Making sure that wireshark.pc is created and installed + * Thu Feb 01 2024 Michal Ruprich - 1:4.2.2-1 - New version 4.2.2