diff --git a/wireshark.spec b/wireshark.spec index 07f7578c765dfd958b92297cda0bf3f6744f479b..aecd51b29465171631f59afec5c7674b2b14d5b5 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -1,6 +1,6 @@ Name: wireshark Version: 2.6.2 -Release: 20 +Release: 21 Epoch: 1 Summary: Network traffic analyzer License: GPL+ and GPL-2.0+ and GPL-3.0 and GPL-3.0+ and BSD and ISC @@ -67,7 +67,7 @@ Requires: %{name}-cli = %{epoch}:%{version}-%{release} xdg-utils hicolor-i BuildRequires: bzip2-devel c-ares-devel elfutils-devel gcc-c++ glib2-devel gnutls-devel gtk3-devel krb5-devel libcap-devel BuildRequires: libgcrypt-devel libnl3-devel libpcap-devel >= 0.9 libselinux-devel libsmi-devel openssl-devel desktop-file-utils BuildRequires: xdg-utils bison flex pcre-devel perl(Pod::Html) perl(Pod::Man) libssh-devel qt5-linguist qt5-qtbase-devel -BuildRequires: qt5-qtmultimedia-devel qt5-qtsvg-devel zlib-devel git cmake +BuildRequires: qt5-qtmultimedia-devel qt5-qtsvg-devel zlib-devel cmake Provides: %{name}-cli = %{epoch}:%{version}-%{release} Obsoletes: %{name}-cli < %{epoch}:%{version}-%{release} wireshark-qt wireshark-gtk @@ -100,7 +100,7 @@ Requires: %{name} = %{epoch}:%{version}-%{release} Files for help with wireshark. %prep -%autosetup -n %{name}-%{version} -S git -p1 +%autosetup -n %{name}-%{version} -p1 %build %cmake -G "Unix Makefiles" -DDISABLE_WERROR=ON -DBUILD_wireshark=ON -DENABLE_QT5=ON -DENABLE_LUA=OFF \ @@ -166,6 +166,9 @@ getent group usbmon >/dev/null || groupadd -r usbmon %{_mandir}/man?/* %changelog +* Fri Jul 30 2021 chenyanpanHW - 2.6.2-21 +- DESC: delete -S git from %autosetup, and delete BuildRequires git + * Tue Jul 27 2021 wangyue - 2.6.2-20 - fix CVE-2019-12295