From dfd6f8d129ab08a6fc2d84e1967afc72c30170235063796667a6bfe3342c2265 Mon Sep 17 00:00:00 2001 From: Robert Frohl Date: Tue, 28 Jan 2025 12:20:42 +0000 Subject: [PATCH] improve qt5/6; hopfully making it easier to understand OBS-URL: https://build.opensuse.org/package/show/network:utilities/wireshark?expand=0&rev=463 --- wireshark.spec | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/wireshark.spec b/wireshark.spec index 0e411e5..0bd1a25 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -27,8 +27,8 @@ %else %bcond_with lz4 %endif -# default to build with qt6, but have an option to still build with qt5 -%bcond_with qt5 +# have an option to still build with qt5 +%bcond_without qt6 Name: wireshark Version: 4.4.3 Release: 0 @@ -80,16 +80,7 @@ Requires(pre): permissions Requires(pre): shadow Recommends: wireshark-ui = %{version} Provides: group(wireshark) -%if %{with qt5} -BuildRequires: libqt5-linguist-devel -BuildRequires: pkgconfig(Qt5Concurrent) >= 5.3.0 -BuildRequires: pkgconfig(Qt5Core) >= 5.3.0 -BuildRequires: pkgconfig(Qt5Gui) -BuildRequires: pkgconfig(Qt5Multimedia) -BuildRequires: pkgconfig(Qt5PrintSupport) -BuildRequires: pkgconfig(Qt5Svg) -BuildRequires: pkgconfig(Qt5Widgets) -%else +%if %{with qt6} BuildRequires: qt6-linguist-devel BuildRequires: qt6-qt5compat-devel BuildRequires: pkgconfig(Qt6Concurrent) @@ -99,6 +90,15 @@ BuildRequires: pkgconfig(Qt6Multimedia) BuildRequires: pkgconfig(Qt6PrintSupport) BuildRequires: pkgconfig(Qt6Svg) BuildRequires: pkgconfig(Qt6Widgets) +%else +BuildRequires: libqt5-linguist-devel +BuildRequires: pkgconfig(Qt5Concurrent) >= 5.3.0 +BuildRequires: pkgconfig(Qt5Core) >= 5.3.0 +BuildRequires: pkgconfig(Qt5Gui) +BuildRequires: pkgconfig(Qt5Multimedia) +BuildRequires: pkgconfig(Qt5PrintSupport) +BuildRequires: pkgconfig(Qt5Svg) +BuildRequires: pkgconfig(Qt5Widgets) %endif %if 0%{?is_opensuse} && 0%{?suse_version} >= 1550 # enable ITU G.729 Annex A/B speech codec only in Tumbleweed