diff --git a/sources b/sources index d681110..b414038 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (wireshark-2.6.0.tar.xz) = a419ed32caeb9f25fc26e345c7baf7d847fee35730c64efad66870a786b26b9f8d5a8665b8b99be88f9cf504f6d9e640584d9849558ff09efc83400588dc6da8 -SHA512 (SIGNATURES-2.6.0.txt) = ce54fc3f44ac70bb3720389845f1337417733cc179d17aaa0f46ef70d3f98fbe886c9756224d27f8abe1c9f18979685721807f9ef5779eb0da028314df2700b0 +SHA512 (wireshark-2.6.1.tar.xz) = e68f7fa5975f10feccb76ab64c9a00f141cd04a12fa586a9839c93630d3554565d8e2ddfab83ec31cb813485b14b3227b7ec6e59baef007a6fe74b8b2a5ed444 +SHA512 (SIGNATURES-2.6.1.txt) = 14b0ac0a601c2330b6d044333c955eaddef56b8da34f6f65e5ff3a26befe6c71a7624141887e249e155d00165f4d4b5e891d9be411970316ee3712ec20495e26 diff --git a/wireshark-0006-Move-tmp-to-var-tmp.patch b/wireshark-0006-Move-tmp-to-var-tmp.patch index f965173..faf34b5 100644 --- a/wireshark-0006-Move-tmp-to-var-tmp.patch +++ b/wireshark-0006-Move-tmp-to-var-tmp.patch @@ -97,8 +97,8 @@ index 5d82e46..8008984 100644 #include +#include /* for get_tmp_dir() */ - #include #include + #include @@ -331,10 +332,10 @@ RtpAnalysisDialog::RtpAnalysisDialog(QWidget &parent, CaptureFile &cf, struct _r // We keep our temp files open for the lifetime of the dialog. The GTK+ diff --git a/wireshark-0007-install-path.patch b/wireshark-0007-install-path.patch deleted file mode 100644 index 7a07ecd..0000000 --- a/wireshark-0007-install-path.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/plugins/codecs/l16_mono/CMakeLists.txt b/plugins/codecs/l16_mono/CMakeLists.txt -index 99b3de3dcc..51589c37da 100644 ---- a/plugins/codecs/l16_mono/CMakeLists.txt -+++ b/plugins/codecs/l16_mono/CMakeLists.txt -@@ -28,7 +28,7 @@ set_source_files_properties( - ) - - include_directories( -- ${CMAKE_SOURCE_DIR}/codec -+ ${CMAKE_SOURCE_DIR}/codecs - ${CMAKE_CURRENT_SOURCE_DIR} - ) - -diff --git a/plugins/codecs/l16_mono/Makefile.am b/plugins/codecs/l16_mono/Makefile.am -index bbc2379eb3..0ad043cd44 100644 ---- a/plugins/codecs/l16_mono/Makefile.am -+++ b/plugins/codecs/l16_mono/Makefile.am -@@ -26,7 +26,7 @@ NONGENERATED_REGISTER_C_FILES = \ - NONGENERATED_C_FILES = \ - $(NONGENERATED_REGISTER_C_FILES) - --wiretap_plugin_LTLIBRARIES = l16mono.la -+codecs_plugin_LTLIBRARIES = l16mono.la - - l16mono_la_SOURCES = \ - $(SRC_FILES) \ diff --git a/wireshark.spec b/wireshark.spec index 543faf7..fa81757 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -6,8 +6,8 @@ Summary: Network traffic analyzer Name: wireshark -Version: 2.6.0 -Release: 2%{?dist} +Version: 2.6.1 +Release: 1%{?dist} Epoch: 1 License: GPL+ Url: http://www.wireshark.org/ @@ -32,8 +32,6 @@ Patch4: wireshark-0004-Restore-Fedora-specific-groups.patch Patch5: wireshark-0005-Fix-paths-in-a-wireshark.desktop-file.patch # Fedora-specific Patch6: wireshark-0006-Move-tmp-to-var-tmp.patch -#codecs installed in wrong path -Patch7: wireshark-0007-install-path.patch BuildRequires: bzip2-devel BuildRequires: c-ares-devel @@ -363,6 +361,9 @@ fi %{_libdir}/pkgconfig/%{name}.pc %changelog +* Thu May 24 2018 Michal Ruprich - 1:2.6.1-1 +- New version 2.6.1 + * Tue May 15 2018 Michal Ruprich - 1:2.6.0-2 - Fixed undefined reference error in tshark (rhbz#1573906) - Correcting usage of build flags (rhbz#1548665)