aboutsummaryrefslogtreecommitdiffstats
path: root/packaging/rpm
diff options
context:
space:
mode:
authorJeff Morriss <jeff.morriss.ws@gmail.com>2015-11-10 17:04:08 -0500
committerJeff Morriss <jeff.morriss.ws@gmail.com>2015-11-11 17:43:34 +0000
commitc4b4b9a59cc0545983ec787a6901d9128268fcfe (patch)
tree29c7d58b4dda0633a77e5b5d4314856c4f3368be /packaging/rpm
parentfb3d38225e6d324b2a99ceebb90f6f1081f6aabd (diff)
Rename the wireshark-gnome RPM package wireshark-gtk.
This was mentioned a while ago in another change but I forgot about it until seeing Gerald's recent release-notes change (which indicates that the RPM and Debian package names for the old GUI are wireshark-gtk). Change-Id: I2a39fce38086d3716c8ef2a07eb8f23bb91a25fa Reviewed-on: https://code.wireshark.org/review/11709 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
Diffstat (limited to 'packaging/rpm')
-rw-r--r--packaging/rpm/SPECS/wireshark.spec.in18
1 files changed, 13 insertions, 5 deletions
diff --git a/packaging/rpm/SPECS/wireshark.spec.in b/packaging/rpm/SPECS/wireshark.spec.in
index a4a4124e25..f4a121f08b 100644
--- a/packaging/rpm/SPECS/wireshark.spec.in
+++ b/packaging/rpm/SPECS/wireshark.spec.in
@@ -174,9 +174,14 @@ This package contains the Qt Wireshark GUI and desktop integration files.
%endif
%if %{with gtk2} || %{with gtk3}
-%package gnome
+%package gtk
Summary: Wireshark's GTK+-based GUI
Group: Applications/Internet
+# This package used to be called wireshark-gnome. Tell the system about
+# the rename. The Provides line is optional to help people find the new
+# package.
+Provides: wireshark-gnome
+Obsoletes: wireshark-gnome
%if %{with gtk3}
Requires: gtk3 >= @GTK3_MIN_VERSION@
BuildRequires: gtk3-devel >= @GTK3_MIN_VERSION@
@@ -208,7 +213,7 @@ Requires: portaudio
# Add this for more readable fonts on some distributions/versions
#Requires: dejavu-sans-mono-fonts
-%description gnome
+%description gtk
This package contains the GTK+ Wireshark GUI and desktop integration files.
%endif
@@ -332,7 +337,7 @@ fi
%endif
%if %{with gtk2} || %{with gtk3}
-%post gnome
+%post gtk
update-desktop-database %{_datadir}/applications &> /dev/null ||:
update-mime-database %{_datadir}/mime &> /dev/null || :
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
@@ -340,7 +345,7 @@ gtk-update-icon-cache -t %{_datadir}/icons/hicolor &>/dev/null || :
/usr/sbin/update-alternatives --install %{_bindir}/wireshark \
%{name} %{_bindir}/wireshark-gtk 10
-%postun gnome
+%postun gtk
update-desktop-database %{_datadir}/applications &> /dev/null ||:
update-mime-database %{_datadir}/mime &> /dev/null || :
if [ $1 -eq 0 ] ; then
@@ -412,7 +417,7 @@ fi
%endif
%if %{with gtk2} || %{with gtk3}
-%files gnome
+%files gtk
%defattr(-,root,root)
%{_datadir}/applications/wireshark.desktop
%{_datadir}/applications/wireshark-gtk.desktop
@@ -426,6 +431,9 @@ fi
%endif
%changelog
+* Tue Nov 10 2015 Jeff Morriss
+- Rename the gnome package to gtk: Wireshark uses Gtk+ but isn't part of GNOME.
+
* Mon Sep 14 2015 Jeff Morriss
- Follow ./configure's decision on whether to configure Lua or not rather than
forcing it to be enabled (and thus failing on some distros which don't ship