diff --git a/wireshark.spec b/wireshark.spec index db6d187476bc22c0e3961856f986e6b393d47d18..bbcf9f32e3f99ed0fd1535aa3c0de2332d8a6a23 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -4,10 +4,10 @@ Summary: Network traffic analyzer Name: wireshark Version: 4.4.3 -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: http://www.wireshark.org/ +Url: https://www.wireshark.org/ Source0: https://wireshark.org/download/src/%{name}-%{version}.tar.xz Source2: 90-wireshark-usbmon.rules @@ -23,50 +23,50 @@ Patch8: wireshark-0008-pkgconfig.patch Requires: xdg-utils Requires: hicolor-icon-theme -Requires(pre): shadow-utils -Requires(post): systemd-udev -Provides: %{name}-cli = %{epoch}:%{version}-%{release} -Obsoletes: %{name}-cli < %{epoch}:%{version}-%{release} wireshark-qt wireshark-gtk - - -BuildRequires: bzip2-devel -BuildRequires: c-ares-devel -BuildRequires: elfutils-devel -BuildRequires: gcc-c++ -BuildRequires: glib2-devel -BuildRequires: gnutls-devel -BuildRequires: krb5-devel -BuildRequires: libcap-devel -BuildRequires: libgcrypt-devel -BuildRequires: libnl3-devel -BuildRequires: libpcap-devel >= 0.9 -BuildRequires: libselinux-devel -BuildRequires: libsmi-devel -BuildRequires: openssl-devel -BuildRequires: desktop-file-utils -BuildRequires: xdg-utils -BuildRequires: bison -BuildRequires: flex -BuildRequires: pcre-devel +BuildRequires: brotli-devel +BuildRequires: bzip2-devel +BuildRequires: c-ares-devel +BuildRequires: elfutils-devel +BuildRequires: gcc-c++ +BuildRequires: glib2-devel +BuildRequires: gnutls-devel +BuildRequires: krb5-devel +BuildRequires: libcap-devel +BuildRequires: libgcrypt-devel +BuildRequires: libmaxminddb-devel +BuildRequires: libnl3-devel +BuildRequires: libpcap-devel >= 0.9 +BuildRequires: libselinux-devel +BuildRequires: libsmi-devel +BuildRequires: libxml2-devel +BuildRequires: lz4-devel +BuildRequires: openssl-devel +BuildRequires: desktop-file-utils +BuildRequires: xdg-utils +BuildRequires: bison +BuildRequires: flex +BuildRequires: pcre-devel BuildRequires: perl -BuildRequires: perl(Pod::Html) -BuildRequires: perl(Pod::Man) -BuildRequires: perl(open) +BuildRequires: perl(Pod::Html) +BuildRequires: perl(Pod::Man) +BuildRequires: perl(open) Buildrequires: libssh-devel -BuildRequires: qt6-qttools-devel -BuildRequires: qt6-linguist -BuildRequires: qt6-qtbase-devel -BuildRequires: qt6-qt5compat-devel -BuildRequires: qt6-qtmultimedia-devel -BuildRequires: qt6-qtsvg-devel -BuildRequires: speexdsp-devel -BuildRequires: zlib-devel -BuildRequires: asciidoctor +BuildRequires: qt6-qttools-devel +BuildRequires: qt6-linguist +BuildRequires: qt6-qtbase-devel +BuildRequires: qt6-qt5compat-devel +BuildRequires: qt6-qtmultimedia-devel +BuildRequires: qt6-qtsvg-devel +BuildRequires: speexdsp-devel +BuildRequires: zlib-devel +BuildRequires: asciidoctor Buildrequires: cmake BuildRequires: systemd-devel BuildRequires: systemd BuildRequires: libnghttp2-devel +BuildRequires: gettext BuildRequires: pulseaudio +Obsoletes: wireshark-gtk < %{epoch}:%{version}-%{release} %description Wireshark allows you to examine protocol data stored in files or as it is @@ -79,9 +79,29 @@ and the ability to reassemble multiple protocol packets in order to, for example, view a complete TCP stream, save the contents of a file which was transferred over HTTP or CIFS, or play back an RTP audio stream. +%package cli +Summary: Network traffic analyzer +Conflicts: %{name} < 1:4.4.3-2 +Requires(pre): shadow-utils +Requires(post): systemd-udev + +%description cli +This package contains command-line utilities, plugins, and documentation for +Wireshark. + +%package qt +Summary: Network traffic analyzer - Qt GUI +Obsoletes: %{name} < 1:4.4.3-2 +Provides: %{name} = %{epoch}:%{version}-%{release} +Requires: %{name}-cli = %{epoch}:%{version}-%{release} +Requires: hicolor-icon-theme + +%description qt +This package contains qt gui components for Wireshark. + %package devel Summary: Development headers and libraries for wireshark -Requires: %{name} = %{epoch}:%{version}-%{release} +Requires: %{name}-cli = %{epoch}:%{version}-%{release} %description devel The wireshark-devel package contains the header files, developer @@ -99,7 +119,6 @@ and plugins. -DDISABLE_WERROR=ON \ -DBUILD_wireshark=ON \ -DENABLE_LUA=OFF \ - -DBUILD_mmdbresolve=OFF \ -DBUILD_randpktdump=OFF \ -DBUILD_androiddump=ON \ -DENABLE_SMI=ON \ @@ -116,6 +135,8 @@ and plugins. %cmake_install %cmake_install --component Development +mv %{buildroot}%{_datadir}/doc/%{name} ./doc_installed + #install devel files (inspired by debian/wireshark-dev.header-files) install -d -m 0755 %{buildroot}%{_includedir}/wireshark IDIR="%{buildroot}%{_includedir}/wireshark" @@ -126,33 +147,45 @@ install -Dpm 644 %{S:3} %{buildroot}%{_sysusersdir}/%{name}.conf %check desktop-file-validate %{buildroot}%{_datadir}/applications/org.wireshark.Wireshark.desktop -%pre -getent group wireshark >/dev/null || groupadd -r wireshark -exit 0 -%post +%pre cli +%sysusers_create_compat %{SOURCE3} + +%post cli # skip triggering if udevd isn't even accessible, e.g. containers or # rpm-ostree-based systems if [ -S /run/udev/control ]; then /usr/bin/udevadm trigger --subsystem-match=usbmon fi -%files -%{_datadir}/applications/org.wireshark.Wireshark.desktop -%{_datadir}/metainfo/*.xml -%{_datadir}/mime/packages/*.xml -%{_datadir}/icons/hicolor/*/apps/* -%{_datadir}/icons/hicolor/*/mimetypes/* -%{_bindir}/* -%{_mandir}/man1/wireshark.* -%{_sysusersdir}/%{name}.conf +%files cli %license COPYING +%doc AUTHORS INSTALL README* +%doc doc_installed/*.html doc_installed/*.css +%{_bindir}/capinfos +%{_bindir}/captype +%{_bindir}/editcap +%{_bindir}/mergecap +%{_bindir}/randpkt +%{_bindir}/reordercap +%{_bindir}/sharkd +%{_bindir}/text2pcap +%{_bindir}/tshark +%{_bindir}/mmdbresolve %attr(0750, root, wireshark) %caps(cap_net_raw,cap_net_admin=ep) %{_bindir}/dumpcap +%{_bindir}/rawshark %{_udevrulesdir}/90-wireshark-usbmon.rules %{_libdir}/lib*.so.* %dir %{_libdir}/wireshark %dir %{_libdir}/wireshark/extcap %dir %{_libdir}/wireshark/plugins -%{_libdir}/wireshark/extcap/* +%{_libdir}/wireshark/extcap/ciscodump +%{_libdir}/wireshark/extcap/udpdump +%{_libdir}/wireshark/extcap/wifidump +%{_libdir}/wireshark/extcap/sshdump +%{_libdir}/wireshark/extcap/sdjournal +%{_libdir}/wireshark/extcap/dpauxmon +%{_libdir}/wireshark/extcap/androiddump +#the version wireshark uses to store plugins is only x.y, not .z %dir %{_libdir}/wireshark/plugins/%{plugins_version} %dir %{_libdir}/wireshark/plugins/%{plugins_version}/epan %dir %{_libdir}/wireshark/plugins/%{plugins_version}/wiretap @@ -160,9 +193,15 @@ fi %{_libdir}/wireshark/plugins/%{plugins_version}/epan/*.so %{_libdir}/wireshark/plugins/%{plugins_version}/wiretap/*.so %{_libdir}/wireshark/plugins/%{plugins_version}/codecs/*.so -%dir %{_datadir}/wireshark -%{_datadir}/wireshark/* -%{_datadir}/doc/wireshark/* +%{_datadir}/wireshark +%{_sysusersdir}/%{name}.conf + +%files qt +%{_bindir}/wireshark +%{_datadir}/applications/org.wireshark.Wireshark.desktop +%{_datadir}/metainfo/org.wireshark.Wireshark.metainfo.xml +%{_datadir}/mime/packages/org.wireshark.Wireshark.xml +%{_datadir}/icons/hicolor/*/*/* %files devel %{_includedir}/wireshark @@ -175,6 +214,9 @@ fi %{_mandir}/man?/* %changelog +* Fri Jan 10 2025 Funda Wang - 1:4.4.3-2 +- split qt6 gui into separated package, so that wireshark-cli won't pull whole qt6 + * Thu Jan 09 2025 Funda Wang - 1:4.4.3-1 - update to 4.4.3