diff --git a/wireshark.changes b/wireshark.changes index d49e3d2..3ee3720 100644 --- a/wireshark.changes +++ b/wireshark.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sun Aug 17 12:22:05 UTC 2014 - andreas.stieger@gmx.de + +- split UI into wireshark-ui-gtk and wireshark-ui-qt, to reduce + dependencies, one of which is required by the main package +- remove unknown configure option --with-python + ------------------------------------------------------------------- Fri Aug 15 22:11:53 UTC 2014 - andreas.stieger@gmx.de diff --git a/wireshark.spec b/wireshark.spec index a4e2e6d..5a3c36d 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -20,6 +20,7 @@ %define use_caps 0 %define use_gtk3 0%{?suse_version} > 1140 +%bcond_without gtk %bcond_without qt Name: wireshark @@ -42,11 +43,13 @@ Patch6: wireshark-1.12.0-qt-QFont-stylename.patch BuildRequires: bison BuildRequires: cairo-devel BuildRequires: flex +%if %{with gtk} %if 0%{use_gtk3} BuildRequires: gtk3-devel >= 3.0.0 %else BuildRequires: gtk2-devel >= 2.12.0 -%endif +%endif # use_gtk3 +%endif # with gtk %if %{with qt} %if 0%{?suse_version} >= 1220 BuildRequires: pkgconfig(QtCore) >= 4.6.0 @@ -89,6 +92,7 @@ Recommends: GeoIP %if 0%{?suse_version} >= 1230 BuildRequires: gpg-offline %endif +Requires: wireshark-ui = %{version} %description Wireshark is a free network protocol analyzer for Unix and Windows. It @@ -115,6 +119,32 @@ and detail information for each packet. Wireshark has several powerful features, including a rich display filter language and the ability to view the reconstructed stream of a TCP session. +%if %{with gtk} + +%package ui-gtk +Summary: A Network Traffic Analyser - GTK+ UI +Group: Productivity/Networking/Diagnostic +Requires: %{name} = %{version} +Provides: %{name}-ui = %{version} + +%description ui-gtk +This package contains the classic GTK+ UI of Wireshark. + +%endif + +%if %{with qt} + +%package ui-qt +Summary: A Network Traffic Analyser - Qt UI +Group: Productivity/Networking/Diagnostic +Requires: %{name} = %{version} +Provides: %{name}-ui = %{version} + +%description ui-qt +This package contains the newer Qt based UI for Wireshark. + +%endif + %prep %{?gpg_verify: %gpg_verify %{S:2}} # The publisher doesn't sign the source tarball, but a signatures file containing multiple hashes. @@ -126,12 +156,14 @@ echo "`grep %{name}-%{version}.tar.bz2 %{S:2} | grep SHA1 | head -n1 | cut -d= - %patch2 -p1 %patch4 -p1 +%if %{with gtk} sed -i 's/^Icon=wireshark.png$/Icon=wireshark/' wireshark.desktop # run as root on 11.3 and older - bnc#349782 %if ! %{use_caps} %patch1 -p1 sed -i 's!^Exec=wireshark!Exec=/usr/bin/xdg-su -c /usr/bin/wireshark!' wireshark.desktop %endif +%endif # with gtk %patch5 -p1 %patch6 -p1 @@ -143,6 +175,7 @@ sed -i 's!^Exec=wireshark!Exec=/usr/bin/xdg-su -c /usr/bin/wireshark!' wireshark %if 0%{?suse_version} < 1220 --without-zlib \ %endif +%if %{with gtk} %if 0%{?use_gtk3} --with-gtk3=yes \ --with-gtk2=no \ @@ -150,6 +183,10 @@ sed -i 's!^Exec=wireshark!Exec=/usr/bin/xdg-su -c /usr/bin/wireshark!' wireshark --with-gtk3=no \ --with-gtk2=yes \ %endif +%else + --with-gtk3=no \ + --with-gtk2=no \ +%endif # with gtk %if %{with qt} --with-qt=yes \ %else @@ -158,7 +195,6 @@ sed -i 's!^Exec=wireshark!Exec=/usr/bin/xdg-su -c /usr/bin/wireshark!' wireshark --with-ssl \ --with-gnutls=yes \ --with-gcrypt=yes \ - --with-python \ --with-plugins=%{_libdir}/%{name}/plugins/%{version} make %{?_smp_mflags} @@ -166,7 +202,9 @@ make %{?_smp_mflags} %install make DESTDIR=%{buildroot} install find %{buildroot} -name "*.la" -delete -print +%if %{with gtk} ln -fs wireshark %{buildroot}%{_bindir}/ethereal +%endif ln -fs tshark %{buildroot}%{_bindir}/tethereal install -d -m 0755 %{buildroot}%{_sysconfdir} install -d -m 0755 %{buildroot}%{_mandir}/man1/ @@ -193,11 +231,13 @@ install -m 644 wiretap/*.h "${IDIR}/wiretap" install -m 644 wsutil/*.h "${IDIR}/wsutil" install -m 644 ws_symbol_export.h "${IDIR}/" +%if %{with gtk} install -D -m 0644 image/wsicon48.png %{buildroot}%{_datadir}/pixmaps/wireshark.png install -D -m 0644 wireshark.desktop %{buildroot}%{_datadir}/applications/wireshark.desktop %if 0%{?suse_version} %suse_update_desktop_file %{name} %endif +%endif %clean rm -rf %{buildroot} @@ -217,14 +257,8 @@ getent group wireshark >/dev/null || groupadd wireshark %doc AUTHORS COPYING NEWS README README.linux README.vmware %doc %{_mandir}/man1/[^i]* %doc %{_mandir}/man4/* -%{_datadir}/applications/wireshark.desktop -%{_datadir}/pixmaps/wireshark.png %{_bindir}/ethereal %{_bindir}/tethereal -%{_bindir}/wireshark -%if %{with qt} -%{_bindir}/wireshark-qt -%endif %{_bindir}/editcap %{_bindir}/tshark %{_bindir}/mergecap @@ -250,4 +284,22 @@ getent group wireshark >/dev/null || groupadd wireshark %{_includedir}/wireshark %{_libdir}/lib*.so +%if %{with gtk} + +%files ui-gtk +%defattr(-,root,root) +%{_bindir}/wireshark +%{_datadir}/applications/wireshark.desktop +%{_datadir}/pixmaps/wireshark.png + +%endif + +%if %{with qt} + +%files ui-qt +%defattr(-,root,root) +%{_bindir}/wireshark-qt + +%endif + %changelog