Hello community,
here is the log from the commit of package wireshark for openSUSE:Factory checked in at 2014-08-18 11:24:05
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/wireshark (Old)
and /work/SRC/openSUSE:Factory/.wireshark.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "wireshark"
Changes:
--------
--- /work/SRC/openSUSE:Factory/wireshark/wireshark.changes 2014-08-14 14:58:37.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.wireshark.new/wireshark.changes 2014-08-18 11:24:14.000000000 +0200
@@ -1,0 +2,10 @@
+Sun Aug 17 16:08:46 UTC 2014 - andreas.stieger@gmx.de
+
+- Build experimental UI wireshark-qt:
+ * add wireshark-1.12.0-qt-QFont-stylename.patch
+ to support building with Qt 4.6 on SLE 11
+ * 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
+
+-------------------------------------------------------------------
New:
----
wireshark-1.12.0-qt-QFont-stylename.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ wireshark.spec ++++++
--- /var/tmp/diff_new_pack.J0yU4O/_old 2014-08-18 11:24:15.000000000 +0200
+++ /var/tmp/diff_new_pack.J0yU4O/_new 2014-08-18 11:24:15.000000000 +0200
@@ -20,6 +20,8 @@
%define use_caps 0
%define use_gtk3 0%{?suse_version} > 1140
+%bcond_without gtk
+%bcond_without qt
Name: wireshark
Version: 1.12.0
@@ -37,14 +39,24 @@
Patch2: wireshark-1.2.0-geoip.patch
Patch4: wireshark-1.10.0-enable_lua.patch
Patch5: wireshark-1.10.0-authors-pod2man.patch
+Patch6: wireshark-1.12.0-qt-QFont-stylename.patch
BuildRequires: bison
BuildRequires: cairo-devel
BuildRequires: flex
-%if 0%{?use_gtk3}
+%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
+%else
+BuildRequires: libqt4-devel >= 4.6.0
+%endif # 12.20
+%endif # with qt
BuildRequires: krb5-devel
BuildRequires: libcap-devel
BuildRequires: libcares-devel
@@ -80,6 +92,7 @@
%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
@@ -106,6 +119,32 @@
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.
@@ -117,14 +156,17 @@
%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
%build
@@ -133,6 +175,7 @@
%if 0%{?suse_version} < 1220
--without-zlib \
%endif
+%if %{with gtk}
%if 0%{?use_gtk3}
--with-gtk3=yes \
--with-gtk2=no \
@@ -140,11 +183,18 @@
--with-gtk3=no \
--with-gtk2=yes \
%endif
+%else
+ --with-gtk3=no \
+ --with-gtk2=no \
+%endif # with gtk
+%if %{with qt}
+ --with-qt=yes \
+%else
+ --with-qt=no \
+%endif
--with-ssl \
--with-gnutls=yes \
--with-gcrypt=yes \
- --with-python \
- --with-qt=no \
--with-plugins=%{_libdir}/%{name}/plugins/%{version}
make %{?_smp_mflags}
@@ -152,7 +202,9 @@
%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/
@@ -179,11 +231,13 @@
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}
@@ -203,11 +257,8 @@
%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
%{_bindir}/editcap
%{_bindir}/tshark
%{_bindir}/mergecap
@@ -233,4 +284,22 @@
%{_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
++++++ wireshark-1.12.0-qt-QFont-stylename.patch ++++++
From: Andreas Stieger