improve qt5/6; hopfully making it easier to understand

OBS-URL: https://build.opensuse.org/package/show/network:utilities/wireshark?expand=0&rev=463
This commit is contained in:
Robert Frohl 2025-01-28 12:20:42 +00:00 committed by Git OBS Bridge
parent 6a622c402a
commit dfd6f8d129

View File

@ -27,8 +27,8 @@
%else %else
%bcond_with lz4 %bcond_with lz4
%endif %endif
# default to build with qt6, but have an option to still build with qt5 # have an option to still build with qt5
%bcond_with qt5 %bcond_without qt6
Name: wireshark Name: wireshark
Version: 4.4.3 Version: 4.4.3
Release: 0 Release: 0
@ -80,16 +80,7 @@ Requires(pre): permissions
Requires(pre): shadow Requires(pre): shadow
Recommends: wireshark-ui = %{version} Recommends: wireshark-ui = %{version}
Provides: group(wireshark) Provides: group(wireshark)
%if %{with qt5} %if %{with qt6}
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
BuildRequires: qt6-linguist-devel BuildRequires: qt6-linguist-devel
BuildRequires: qt6-qt5compat-devel BuildRequires: qt6-qt5compat-devel
BuildRequires: pkgconfig(Qt6Concurrent) BuildRequires: pkgconfig(Qt6Concurrent)
@ -99,6 +90,15 @@ BuildRequires: pkgconfig(Qt6Multimedia)
BuildRequires: pkgconfig(Qt6PrintSupport) BuildRequires: pkgconfig(Qt6PrintSupport)
BuildRequires: pkgconfig(Qt6Svg) BuildRequires: pkgconfig(Qt6Svg)
BuildRequires: pkgconfig(Qt6Widgets) 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 %endif
%if 0%{?is_opensuse} && 0%{?suse_version} >= 1550 %if 0%{?is_opensuse} && 0%{?suse_version} >= 1550
# enable ITU G.729 Annex A/B speech codec only in Tumbleweed # enable ITU G.729 Annex A/B speech codec only in Tumbleweed