[wireshark/f16] updated autoconf macros and pkgconfig file in wireshark-devel to reflect current config.h Resolves:

[Jan Šafránek]

commit feabc146219d2dd700779e618edeb1e648aecf3c
Author: Jan Safranek <jsafrane at redhat.com>
Date:   Mon Oct 24 09:37:20 2011 +0200

    updated autoconf macros and pkgconfig file in wireshark-devel to reflect current config.h
    Resolves: #746655

 wireshark-autoconf.m4 |    2 +-
 wireshark.spec        |    8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/wireshark-autoconf.m4 b/wireshark-autoconf.m4
index 56bb7ab..d8015d8 100644
--- a/wireshark-autoconf.m4
+++ b/wireshark-autoconf.m4
@@ -10,7 +10,7 @@ AC_DEFUN([AM_PATH_WIRESHARK],[
 	wireshark_found=no
 	if test "$wireshark_config_prefix" != "" ; then
 		AM_PATH_GLIB_2_0(,,,[gmodule])
-		WIRESHARK_CFLAGS="-DWS_VAR_IMPORT=extern -I$wireshark_config_prefix/include/wireshark -I$wireshark_config_prefix/include/wireshark/epan -I/usr/include/wireshark -I/usr/include/wireshark/epan $GLIB_CFLAGS"
+		WIRESHARK_CFLAGS="-DWS_VAR_IMPORT=extern -DWS_MSVC_NORETURN= -I$wireshark_config_prefix/include/wireshark -I$wireshark_config_prefix/include/wireshark/epan -I/usr/include/wireshark -I/usr/include/wireshark/epan $GLIB_CFLAGS"
 		WIRESHARK_LIBS="-L$wireshark_config_prefix/lib -lwireshark -lwiretap $GLIB_LIBS"
 		wireshark_found=yes
 	else
diff --git a/wireshark.spec b/wireshark.spec
index 8bb88fb..39d90c5 100644
--- a/wireshark.spec
+++ b/wireshark.spec
@@ -11,7 +11,7 @@
 Summary:	Network traffic analyzer
 Name:		wireshark
 Version:	1.6.2
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	GPL+
 Group:		Applications/Internet
 Source0:	http://wireshark.org/download/src/%{name}-%{version}.tar.bz2
@@ -214,7 +214,7 @@ cat > "${RPM_BUILD_ROOT}%{_libdir}/pkgconfig/wireshark.pc" <<- "EOF"
 	Version:	%{version}
 	Requires:	glib-2.0 gmodule-2.0
 	Libs:		-L${libdir} -lwireshark -lwiretap
-	Cflags:		-DWS_VAR_IMPORT=extern -DHAVE_STDARG_H -I${includedir}/wireshark -I${includedir}/wireshark/epan
+	Cflags:		-DWS_VAR_IMPORT=extern -DHAVE_STDARG_H -DWS_MSVC_NORETURN= -I${includedir}/wireshark -I${includedir}/wireshark/epan
 EOF
 
 #	Install the autoconf macro.
@@ -330,6 +330,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_sbindir}/idl2wrs
 
 %changelog
+* Fri Oct 21 2011 Jan Safranek <jsafrane at redhat.com> - 1.6.2-3
+- updated autoconf macros and pkgconfig file in wireshark-devel to reflect
+  current config.h (#746655)
+
 * Mon Oct 17 2011 Steve Dickson <steved at redhat.com> - 1.6.2-2
 - Fixed a regression introduce by upstream patch r38306
     which caused v4.1 traffic not to be displayed.