- switch to libsmi from net-snmp

- disable ADNS due to its lack of Ipv6 support
- 0.99.7 prerelease 2
This commit is contained in:
Radek Vokál 2007-11-26 15:40:31 +00:00
parent e301ecb6a6
commit bc92d51775
3 changed files with 25 additions and 10 deletions

View File

@ -1 +1 @@
wireshark-0.99.7-SVN-23507.tar.gz wireshark-0.99.7-SVN-23536.tar.gz

View File

@ -1 +1 @@
ebfc388ed12c22faf000999c587e8baf wireshark-0.99.7-SVN-23507.tar.gz 6e5d9fbdc1920e0e2fe48c24c7ac9eba wireshark-0.99.7-SVN-23536.tar.gz

View File

@ -1,11 +1,12 @@
%define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()") %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
#define to 0 for final version #define to 0 for final version
%define svn_version 23507 %define svn_version 23536
%define with_adns 0
Summary: Network traffic analyzer Summary: Network traffic analyzer
Name: wireshark Name: wireshark
Version: 0.99.7 Version: 0.99.7
Release: 0.pre1%{?dist} Release: 0.pre2%{?dist}
License: GPL+ License: GPL+
Group: Applications/Internet Group: Applications/Internet
%if %{svn_version} %if %{svn_version}
@ -21,8 +22,7 @@ Patch3: wireshark-nfsv4-opts.patch
Url: http://www.wireshark.org/ Url: http://www.wireshark.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libpcap-devel >= 0.9 BuildRequires: libpcap-devel >= 0.9
BuildRequires: net-snmp-devel >= 5.4 BuildRequires: libsmi
BuildRequires: net-snmp-utils >= 5.4
BuildRequires: zlib-devel, bzip2-devel BuildRequires: zlib-devel, bzip2-devel
BuildRequires: openssl-devel BuildRequires: openssl-devel
BuildRequires: glib2-devel, gtk2-devel BuildRequires: glib2-devel, gtk2-devel
@ -30,7 +30,10 @@ BuildRequires: elfutils-devel, krb5-devel
BuildRequires: python, pcre-devel, libselinux BuildRequires: python, pcre-devel, libselinux
BuildRequires: gnutls-devel BuildRequires: gnutls-devel
BuildRequires: desktop-file-utils, automake, libtool BuildRequires: desktop-file-utils, automake, libtool
BuildRequires: htmlview, adns-devel BuildRequires: xdg-utils
%if %{with_adns}
BuildRequires: adns-devel
%endif
Obsoletes: ethereal Obsoletes: ethereal
Provides: ethereal Provides: ethereal
@ -41,8 +44,11 @@ Group: Applications/Internet
Requires: gtk2 Requires: gtk2
Requires: usermode >= 1.37 Requires: usermode >= 1.37
Requires: wireshark = %{version}-%{release} Requires: wireshark = %{version}-%{release}
Requires: net-snmp >= 5.4, net-snmp-libs >= 5.4 Requires: libsmi
Requires: xdg-utils, adns Requires: xdg-utils
%if %{with_adns}
Requires: adns
%endif
Obsoletes: ethereal-gnome Obsoletes: ethereal-gnome
Provides: ethereal-gnome Provides: ethereal-gnome
@ -84,13 +90,17 @@ export LDFLAGS="$LDFLAGS -lm -lcrypto"
--bindir=%{_sbindir} \ --bindir=%{_sbindir} \
--enable-zlib \ --enable-zlib \
--enable-ipv6 \ --enable-ipv6 \
--with-net-snmp \ --with-libsmi \
--with-gnu-ld \ --with-gnu-ld \
--disable-static \ --disable-static \
--disable-usr-local \ --disable-usr-local \
--enable-gtk2 \ --enable-gtk2 \
--with-pic \ --with-pic \
%if %{with_adns}
--with-adns \ --with-adns \
%else
--with-adns=no \
%endif
--with-ssl \ --with-ssl \
--disable-warnings-as-errors \ --disable-warnings-as-errors \
--with-plugindir=%{_libdir}/%{name}/plugins/%{version} --with-plugindir=%{_libdir}/%{name}/plugins/%{version}
@ -186,6 +196,11 @@ rm -rf $RPM_BUILD_ROOT
%changelog %changelog
* Mon Nov 26 2007 Radek Vokal <rvokal@redhat.com> 0.99.7-0.pre2
- switch to libsmi from net-snmp
- disable ADNS due to its lack of Ipv6 support
- 0.99.7 prerelease 2
* Tue Nov 20 2007 Radek Vokal <rvokal@redhat.com> 0.99.7-0.pre1 * Tue Nov 20 2007 Radek Vokal <rvokal@redhat.com> 0.99.7-0.pre1
- upgrade to 0.99.7 pre-release - upgrade to 0.99.7 pre-release