rpms/wireshark
7
0
Fork 0
Code Issues Pull Requests Releases Activity

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

Browse Source 
Resolves: #746655
This commit is contained in:
Jan Safranek 2011-10-24 09:37:20 +02:00
parent c5c3b02f21
commit feabc14621
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wireshark-autoconf.m4
View File

@ -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

8
wireshark.spec
View File

@ -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@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@redhat.com> - 1.6.2-2
- Fixed a regression introduce by upstream patch r38306
which caused v4.1 traffic not to be displayed.