From 13974b6b7cc1d61e599fe1a62c6fc3ab76222dca Mon Sep 17 00:00:00 2001
From: Peter Hatina <phatina@redhat.com>
Date: Sep 24 2013 11:15:23 +0000
Subject: fix build error caused by symbols clash


---

diff --git a/wireshark-0013-dirent-symbols-clash.patch b/wireshark-0013-dirent-symbols-clash.patch
new file mode 100644
index 0000000..3bef19b
--- /dev/null
+++ b/wireshark-0013-dirent-symbols-clash.patch
@@ -0,0 +1,58 @@
+diff --git a/epan/dissectors/packet-gluster.h b/epan/dissectors/packet-gluster.h
+index f023f62..d0d4651 100644
+--- a/epan/dissectors/packet-gluster.h
++++ b/epan/dissectors/packet-gluster.h
+@@ -356,15 +356,15 @@ enum gf_fop_procnum {
+ 
+ /* dir-entry types from libglusterfs/src/compat.h */
+ enum gluster_entry_types {
+-	DT_UNKNOWN = 0,
+-	DT_FIFO = 1,
+-	DT_CHR = 2,
+-	DT_DIR = 4,
+-	DT_BLK = 6,
+-	DT_REG = 8,
+-	DT_LNK = 10,
+-	DT_SOCK = 12,
+-	DT_WHT = 14
++	GLUSTER_DT_UNKNOWN = 0,
++	GLUSTER_DT_FIFO = 1,
++	GLUSTER_DT_CHR = 2,
++	GLUSTER_DT_DIR = 4,
++	GLUSTER_DT_BLK = 6,
++	GLUSTER_DT_REG = 8,
++	GLUSTER_DT_LNK = 10,
++	GLUSTER_DT_SOCK = 12,
++	GLUSTER_DT_WHT = 14
+ };
+ 
+ 
+diff --git a/epan/dissectors/packet-glusterfs.c b/epan/dissectors/packet-glusterfs.c
+index 5f18258..299e783 100644
+--- a/epan/dissectors/packet-glusterfs.c
++++ b/epan/dissectors/packet-glusterfs.c
+@@ -2002,15 +2002,15 @@ static value_string_ext glusterfs3_1_fop_proc_vals_ext = VALUE_STRING_EXT_INIT(g
+ 
+ /* dir-entry types */
+ static const value_string glusterfs_entry_type_names[] = {
+-	{ DT_UNKNOWN, "DT_UNKNOWN" },
+-	{ DT_FIFO,    "DT_FIFO" },
+-	{ DT_CHR,     "DT_CHR" },
+-	{ DT_DIR,     "DT_DIR" },
+-	{ DT_BLK,     "DT_BLK" },
+-	{ DT_REG,     "DT_REG" },
+-	{ DT_LNK,     "DT_LNK" },
+-	{ DT_SOCK,    "DT_SOCK" },
+-	{ DT_WHT,     "DT_WHT" },
++	{ GLUSTER_DT_UNKNOWN, "DT_UNKNOWN" },
++	{ GLUSTER_DT_FIFO,    "DT_FIFO" },
++	{ GLUSTER_DT_CHR,     "DT_CHR" },
++	{ GLUSTER_DT_DIR,     "DT_DIR" },
++	{ GLUSTER_DT_BLK,     "DT_BLK" },
++	{ GLUSTER_DT_REG,     "DT_REG" },
++	{ GLUSTER_DT_LNK,     "DT_LNK" },
++	{ GLUSTER_DT_SOCK,    "DT_SOCK" },
++	{ GLUSTER_DT_WHT,     "DT_WHT" },
+ 	{ 0, NULL }
+ };
+ static value_string_ext glusterfs_entry_type_names_ext = VALUE_STRING_EXT_INIT(glusterfs_entry_type_names);
diff --git a/wireshark.spec b/wireshark.spec
index c9439f8..d86f0e7 100644
--- a/wireshark.spec
+++ b/wireshark.spec
@@ -21,7 +21,7 @@
 Summary:	Network traffic analyzer
 Name:		wireshark
 Version:	1.10.2
-Release:	6%{?dist}
+Release:	7%{?dist}
 License:	GPL+
 Group:		Applications/Internet
 Source0:	http://wireshark.org/download/src/%{name}-%{version}.tar.bz2
@@ -47,6 +47,7 @@ Patch10:	wireshark-0010-Add-pkgconfig-entry.patch
 Patch11:	wireshark-0011-Install-autoconf-related-file.patch
 # Fedora-specific
 Patch12:	wireshark-0012-tmp-dir.patch
+Patch13:	wireshark-0013-dirent-symbols-clash.patch
 
 Url:		http://www.wireshark.org/
 BuildRequires:	libpcap-devel >= 0.9
@@ -153,6 +154,7 @@ and plugins.
 %patch10 -p1 -b .add_pkgconfig
 %patch11 -p1 -b .install_autoconf
 %patch12 -p1 -b .tmp_dir
+%patch13 -p1 -b .dirent_clash
 
 %build
 %ifarch s390 s390x sparcv9 sparc64
@@ -347,6 +349,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_datadir}/aclocal/*
 
 %changelog
+* Tue Sep 24 2013 Peter Hatina <phatina@redhat.com> - 1.10.2-7
+- fix build error caused by symbols clash
+
 * Tue Sep 17 2013 Peter Hatina <phatina@redhat.com> - 1.10.2-6
 - move default temporary directory to /var/tmp