Ver. 1.12.8
This commit is contained in:
parent
76137e2b71
commit
2304af6862
1
.gitignore
vendored
1
.gitignore
vendored
@ -42,3 +42,4 @@ wireshark-1.2.10.tar.bz2
|
||||
/wireshark-1.12.5.tar.bz2
|
||||
/wireshark-1.12.6.tar.bz2
|
||||
/wireshark-1.12.7.tar.bz2
|
||||
/wireshark-1.12.8.tar.bz2
|
||||
|
2
sources
2
sources
@ -1 +1 @@
|
||||
c8ae53f648b1dcbf6e74495401a0f1ab wireshark-1.12.7.tar.bz2
|
||||
988a4595a4a87dafb3c4870ea40e89b5 wireshark-1.12.8.tar.bz2
|
||||
|
@ -1,12 +0,0 @@
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 3ee58d9..f9af3af 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -1539,7 +1539,6 @@ fi
|
||||
if test "$have_gtk" = "yes" ; then
|
||||
# If we have GTK then add flags for it.
|
||||
|
||||
- CPPFLAGS="-DGDK_PIXBUF_DISABLE_DEPRECATED $CPPFLAGS"
|
||||
CPPFLAGS="-DGDK_DISABLE_DEPRECATED $CPPFLAGS"
|
||||
if test \( $gtk_config_major_version -eq 3 -a $gtk_config_minor_version -ge 10 \) ; then
|
||||
## Allow use of deprecated & disable deprecated warnings if Gtk >= 3.10;
|
@ -20,8 +20,8 @@
|
||||
|
||||
Summary: Network traffic analyzer
|
||||
Name: wireshark
|
||||
Version: 1.12.7
|
||||
Release: 2%{?dist}
|
||||
Version: 1.12.8
|
||||
Release: 1%{?dist}
|
||||
License: GPL+
|
||||
Group: Applications/Internet
|
||||
Source0: http://wireshark.org/download/src/%{name}-%{version}.tar.bz2
|
||||
@ -44,9 +44,8 @@ Patch7: wireshark-0007-Install-autoconf-related-file.patch
|
||||
Patch8: wireshark-0008-move-default-temporary-directory-to-var-tmp.patch
|
||||
# Fedora-specific
|
||||
Patch9: wireshark-0009-Fix-paths-in-a-wireshark.desktop-file.patch
|
||||
Patch10: wireshark-0010-gdk.patch
|
||||
# Backported from upstream - https://code.wireshark.org/review/#/c/10015/
|
||||
Patch11: wireshark-0011-Allow-redefining-all-ports-for-RADIUS.patch
|
||||
Patch10: wireshark-0010-Allow-redefining-all-ports-for-RADIUS.patch
|
||||
|
||||
Url: http://www.wireshark.org/
|
||||
BuildRequires: libpcap-devel >= 0.9
|
||||
@ -169,8 +168,7 @@ Cflags: -I\${includedir}" > wireshark.pc.in
|
||||
%patch7 -p1 -b .install_autoconf
|
||||
%patch8 -p1 -b .tmp_dir
|
||||
%patch9 -p1 -b .fix_paths
|
||||
%patch10 -p1 -b .gdk
|
||||
%patch11 -p1 -b .radius_ports
|
||||
%patch10 -p1 -b .radius_ports
|
||||
|
||||
%build
|
||||
%ifarch s390 s390x sparcv9 sparc64
|
||||
@ -411,6 +409,10 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
|
||||
%{_datadir}/aclocal/*
|
||||
|
||||
%changelog
|
||||
* Thu Oct 15 2015 Peter Hatina <phatina@redhat.com> - 1.12.8-1
|
||||
- Ver. 1.12.8
|
||||
- Dropped patch no. 10 (applied upstream)
|
||||
|
||||
* Fri Aug 21 2015 Peter Lemenkov <lemenkov@gmail.com> - 1.12.7-2
|
||||
- Enable libnl3 (see rhbz#1207386, rhbz#1247566)
|
||||
- Remove airpcap switch (doesn't have any effect on Linux)
|
||||
|
Loading…
Reference in New Issue
Block a user