diff options
| author | Jeff Morriss <jeff.morriss.ws@gmail.com> | 2014-08-04 15:44:02 -0400 |
|---|---|---|
| committer | Jeff Morriss <jeff.morriss.ws@gmail.com> | 2014-08-04 19:48:52 +0000 |
| commit | 5d8d02e0a16eefd4a46dc4a868aee9968794ecef (patch) | |
| tree | 490dbaae0cb7d7e3721c4425079a5bba3aa5c414 /packaging | |
| parent | becb4d7837dbb506ec6359a72f7adbf0166ae0a2 (diff) | |
| download | wireshark-5d8d02e0a16eefd4a46dc4a868aee9968794ecef.tar.gz | |
Fix RPM builds with a prefix other than /usr.
The location of update-alternatives does not depend on Wireshark's
installation prefix: it's always in /usr/sbin/.
Change-Id: I7dda9cebec83bc64133adfeb5ee6af70dc6dc7ab
Reviewed-on: https://code.wireshark.org/review/3413
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
(cherry picked from commit 644b2e7c69c5289b8a6f524aef84eb7c54cf6058)
Reviewed-on: https://code.wireshark.org/review/3414
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/rpm/SPECS/wireshark.spec.in | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/packaging/rpm/SPECS/wireshark.spec.in b/packaging/rpm/SPECS/wireshark.spec.in index ad180e290f..249eb17bc1 100644 --- a/packaging/rpm/SPECS/wireshark.spec.in +++ b/packaging/rpm/SPECS/wireshark.spec.in @@ -134,8 +134,8 @@ Requires: xdg-utils Requires: hicolor-icon-theme BuildRequires: desktop-file-utils Requires(post): desktop-file-utils -Requires(post): %{_sbindir}/update-alternatives -Requires(postun): %{_sbindir}/update-alternatives +Requires(post): /usr/sbin/update-alternatives +Requires(postun): /usr/sbin/update-alternatives %if 0%{?suse_version} # Need this for SuSE's suse_update_desktop_file macro BuildRequires: update-desktop-files @@ -171,8 +171,8 @@ Requires: xdg-utils Requires: hicolor-icon-theme BuildRequires: desktop-file-utils Requires(post): desktop-file-utils -Requires(post): %{_sbindir}/update-alternatives -Requires(postun): %{_sbindir}/update-alternatives +Requires(post): /usr/sbin/update-alternatives +Requires(postun): /usr/sbin/update-alternatives BuildRequires: gcc-c++ %if 0%{?suse_version} # Need this for SuSE's suse_update_desktop_file macro @@ -260,7 +260,7 @@ getent group wireshark >/dev/null || groupadd -r wireshark update-desktop-database &> /dev/null ||: update-mime-database /usr/share/mime &> /dev/null || : touch --no-create /usr/share/icons/hicolor &>/dev/null || : -%{_sbindir}/update-alternatives --install %{_bindir}/wireshark \ +/usr/sbin/update-alternatives --install %{_bindir}/wireshark \ %{name} %{_bindir}/wireshark-gtk 50 %postun gnome @@ -269,7 +269,7 @@ update-mime-database /usr/share/mime &> /dev/null || : if [ $1 -eq 0 ] ; then touch --no-create /usr/share/icons/hicolor &>/dev/null || : gtk-update-icon-cache /usr/share/icons/hicolor &>/dev/null || : - %{_sbindir}/update-alternatives --remove %{name} %{_bindir}/wireshark-gtk + /usr/sbin/update-alternatives --remove %{name} %{_bindir}/wireshark-gtk fi %endif @@ -278,7 +278,7 @@ fi update-desktop-database &> /dev/null ||: update-mime-database /usr/share/mime &> /dev/null || : touch --no-create /usr/share/icons/hicolor &>/dev/null || : -%{_sbindir}/update-alternatives --install %{_bindir}/wireshark \ +/usr/sbin/update-alternatives --install %{_bindir}/wireshark \ %{name} %{_bindir}/wireshark-qt 10 %postun qt @@ -287,7 +287,7 @@ update-mime-database /usr/share/mime &> /dev/null || : if [ $1 -eq 0 ] ; then touch --no-create /usr/share/icons/hicolor &>/dev/null || : gtk-update-icon-cache /usr/share/icons/hicolor &>/dev/null || : - %{_sbindir}/update-alternatives --remove %{name} %{_bindir}/wireshark-qt + /usr/sbin/update-alternatives --remove %{name} %{_bindir}/wireshark-qt fi %endif |