diff --git a/wireshark/wireshark.spec b/wireshark/wireshark.spec index e04c049686..80212e28fa 100644 --- a/wireshark/wireshark.spec +++ b/wireshark/wireshark.spec @@ -33,9 +33,10 @@ Class: EVAL Group: Network License: GPL Version: 0.99.3a -Release: 20060825 +Release: 20060831 # package options +%option with_gui yes %option with_zlib yes %option with_adns yes %option with_pcre yes @@ -51,8 +52,12 @@ Prefix: %{l_prefix} BuildRoot: %{l_buildroot} BuildPreReq: OpenPKG, openpkg >= 20040130, gcc, make, perl, sed PreReq: OpenPKG, openpkg >= 20040130 -BuildPreReq: glib2, gtk2, libpcap, gcrypt -PreReq: glib2, gtk2, libpcap, gcrypt +%if "%{with_gui}" == "yes" +BuildPreReq: glib2, gtk2 +PreReq: glib2, gtk2 +%endif +BuildPreReq: libpcap, gcrypt +PreReq: libpcap, gcrypt %if "%{with_zlib}" == "yes" BuildPreReq: zlib PreReq: zlib @@ -112,10 +117,15 @@ AutoReqProv: no --prefix=%{l_prefix} \ --sysconfdir=%{l_prefix}/etc/wireshark \ --with-plugins=%{l_prefix}/libexec/wireshark \ + --enable-tshark \ +%if "%{with_gui}" == "yes" --enable-wireshark \ --enable-gtk2 \ --with-glib-prefix=%{l_prefix} \ --with-gtk-prefix=%{l_prefix} \ +%else + --disable-wireshark \ +%endif --with-pcap=%{l_prefix} \ --with-libgcrypt-prefix=%{l_prefix} \ %if "%{with_zlib}" == "yes" @@ -153,7 +163,9 @@ AutoReqProv: no rm -rf $RPM_BUILD_ROOT %{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT" strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true +%if "%{with_gui}" == "yes" ln $RPM_BUILD_ROOT%{l_prefix}/bin/wireshark $RPM_BUILD_ROOT%{l_prefix}/bin/ethereal +%endif %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} %files -f files