diff options
Diffstat (limited to 'packaging')
-rw-r--r-- | packaging/nsis/Makefile.nmake | 6 | ||||
-rwxr-xr-x | packaging/nsis/common.nsh | 8 | ||||
-rw-r--r-- | packaging/nsis/wireshark.nsi | 2 | ||||
-rw-r--r-- | packaging/portableapps/win32/Makefile.nmake | 3 | ||||
-rw-r--r-- | packaging/rpm/SPECS/wireshark.spec.in | 114 |
5 files changed, 70 insertions, 63 deletions
diff --git a/packaging/nsis/Makefile.nmake b/packaging/nsis/Makefile.nmake index 0e44a15ecb..0b158f28f7 100644 --- a/packaging/nsis/Makefile.nmake +++ b/packaging/nsis/Makefile.nmake @@ -14,7 +14,7 @@ STAGING_DIR=..\..\$(INSTALL_DIR) EXE=../../tshark.exe ../../editcap.exe \ !IFDEF GTK_DIR - ../../wireshark.exe \ + ../../wireshark-gtk.exe \ !ENDIF ../../text2pcap.exe ../../mergecap.exe ../../capinfos.exe $(WIRESHARK_LIB_DIR)\WinPcap_$(WINPCAP_VERSION).exe DLL=../../wiretap/wiretap-$(WTAP_VERSION).dll ../../wsutil/libwsutil.dll @@ -226,7 +226,7 @@ NSIS_FLAGS=\ !IFDEF HHC_DIR /DHHC_DIR="$(HHC_DIR)" \ !ENDIF -!IF EXIST("..\..\wireshark-qt-release\qtshark.exe") +!IF EXIST("..\..\wireshark-qt-release\wireshark.exe") /DQT_DIR="..\..\wireshark-qt-release" \ !ENDIF @@ -236,7 +236,7 @@ qt-dll-manifest.nsh: windeployqt-to-nsis.ps1 Makefile.nmake set PATH=%PATH%;$(QT5_BASE_DIR)\bin !ENDIF $(POWERSHELL) windeployqt-to-nsis.ps1 \ - -Executable ..\..\wireshark-qt-release\qtshark.exe \ + -Executable ..\..\wireshark-qt-release\wireshark.exe \ -FilePath $@ $(STAGING_DIR)\uninstall.exe : $(NSI) diff --git a/packaging/nsis/common.nsh b/packaging/nsis/common.nsh index 9d25ebf93d..ebfaa92965 100755 --- a/packaging/nsis/common.nsh +++ b/packaging/nsis/common.nsh @@ -16,8 +16,8 @@ Name "${DISPLAY_NAME}" !define PROGRAM_NAME_GTK "${PROGRAM_NAME} 1" !define PROGRAM_FULL_NAME_QT "The ${PROGRAM_NAME} Network Protocol Analyzer" !define PROGRAM_FULL_NAME_GTK "The ${PROGRAM_NAME} Network Protocol Analyzer (classic UI)" -!define PROGRAM_NAME_PATH_QT "qtshark.exe" -!define PROGRAM_NAME_PATH_GTK "${PROGRAM_NAME}.exe" +!define PROGRAM_NAME_PATH_QT "${PROGRAM_NAME}.exe" +!define PROGRAM_NAME_PATH_GTK "${PROGRAM_NAME}-gtk.exe" !define UNINSTALLER_NAME "uninstall.exe" @@ -48,9 +48,9 @@ XPStyle on Push $R0 Push $R1 Push $R2 - + !define UPDATEICONS_UNIQUE ${__LINE__} - + IfFileExists "$SYSDIR\shell32.dll" UpdateIcons.ok_shell32_${UPDATEICONS_UNIQUE} UpdateIcons.error_shell32_${UPDATEICONS_UNIQUE} UpdateIcons.ok_shell32_${UPDATEICONS_UNIQUE}: System::Call 'shell32.dll::SHChangeNotify(i, i, i, i) v (${SHCNE_ASSOCCHANGED}, ${SHCNF_IDLIST}, 0, 0)' diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi index 0782013426..5911503957 100644 --- a/packaging/nsis/wireshark.nsi +++ b/packaging/nsis/wireshark.nsi @@ -819,7 +819,7 @@ SectionEnd ; "Required" !ifdef QT_DIR Section "${PROGRAM_NAME}" SecWiresharkQt ;------------------------------------------- -; by default, QtShark is installed but file is always associate with Wireshark GTK+ +; by default, Wireshark is installed but file is always associate with Wireshark GTK+ SetOutPath $INSTDIR File "${QT_DIR}\${PROGRAM_NAME_PATH_QT}" !include qt-dll-manifest.nsh diff --git a/packaging/portableapps/win32/Makefile.nmake b/packaging/portableapps/win32/Makefile.nmake index a930d41a32..60dee968ba 100644 --- a/packaging/portableapps/win32/Makefile.nmake +++ b/packaging/portableapps/win32/Makefile.nmake @@ -16,7 +16,6 @@ NSIS_PLUGINS = nsis-plugins FINDPROCDLL = $(WIRESHARK_LIB_DIR)\$(NSIS_PLUGINS)\FindProcDLL.dll TOPDIR = ..\..\.. -U3DIST = ..\..\u3\win32 COPY = xcopy MKDIR = mkdir COPY_FLAGS = /d /y @@ -25,7 +24,7 @@ WIN32_SETUP_OPT = --download !ENDIF # XXX This should be defined in config.nmake. -!IF EXIST("..\..\wireshark-qt-release\qtshark.exe") +!IF EXIST("..\..\wireshark-qt-release\wireshark.exe") QT_DIR = "..\..\wireshark-qt-release" !ENDIF !IF EXIST("..\..\wireshark-qt-release\Qt5Core.dll") diff --git a/packaging/rpm/SPECS/wireshark.spec.in b/packaging/rpm/SPECS/wireshark.spec.in index 751f1fcb59..a397cd0b35 100644 --- a/packaging/rpm/SPECS/wireshark.spec.in +++ b/packaging/rpm/SPECS/wireshark.spec.in @@ -2,9 +2,9 @@ # @configure_input@ # configure options: @CONFIG_ARGS@ +%bcond_with qt %bcond_without gtk2 %bcond_with gtk3 -%bcond_with qt # Set these to 1 if you want to ensure your package includes support for them: %global with_adns 0 @@ -29,10 +29,10 @@ Version: @VERSION@ Release: 1 License: GPL+ Group: Applications/Internet -Source: http://wireshark.org/download/src/%{name}-%{version}.tar.bz2 +Source: https://wireshark.org/download/src/%{name}-%{version}.tar.bz2 # Or this URL for automated builds: -#Source: http://wireshark.org/download/automated/src/%{name}-%{version}.tar.bz2 -URL: http://www.wireshark.org/ +#Source: https://wireshark.org/download/automated/src/%{name}-%{version}.tar.bz2 +URL: https://www.wireshark.org/ Packager: Gerald Combs <gerald[AT]wireshark.org> # Some distributions create a wireshark-devel package; get rid of it Obsoletes: wireshark-devel @@ -114,7 +114,35 @@ features, including a rich display filter language and the ability to view the reconstructed stream of a TCP session. This package contains command-line utilities, plugins, and documentation for -Wireshark. A GTK+ and a Qt graphical user interface are packaged separately. +Wireshark. A Qt and GTK+ graphical user interface are packaged separately. + +%if %{with qt} +%package qt +Summary: Qt GUI for Wireshark +Group: Applications/Internet +%if 0%{?suse_version} +Requires: libqt4 >= @QT_MIN_VERSION@ +BuildRequires: libqt4-devel >= @QT_MIN_VERSION@ +%else +Requires: qt >= @QT_MIN_VERSION@ +BuildRequires: qt-devel >= @QT_MIN_VERSION@ +%endif +Requires: %{name} = %{version}-%{release} +Requires: xdg-utils +Requires: hicolor-icon-theme +BuildRequires: desktop-file-utils +Requires(post): desktop-file-utils +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 +BuildRequires: update-desktop-files +%endif + +%description qt +Contains the Qt Wireshark GUI and desktop integration files. +%endif %if %{with gtk2} || %{with gtk3} %package gnome @@ -155,34 +183,6 @@ Requires: portaudio Contains the Gnome (GTK+) Wireshark GUI and desktop integration files. %endif -%if %{with qt} -%package qt -Summary: Qt GUI for Wireshark -Group: Applications/Internet -%if 0%{?suse_version} -Requires: libqt4 >= @QT_MIN_VERSION@ -BuildRequires: libqt4-devel >= @QT_MIN_VERSION@ -%else -Requires: qt >= @QT_MIN_VERSION@ -BuildRequires: qt-devel >= @QT_MIN_VERSION@ -%endif -Requires: %{name} = %{version}-%{release} -Requires: xdg-utils -Requires: hicolor-icon-theme -BuildRequires: desktop-file-utils -Requires(post): desktop-file-utils -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 -BuildRequires: update-desktop-files -%endif - -%description qt -Contains the Qt Wireshark GUI and desktop integration files. -%endif - %prep %setup -q -n %{name}-%{version} @@ -205,9 +205,9 @@ Contains the Qt Wireshark GUI and desktop integration files. %if %{with_portaudio} --with-portaudio \ %endif + %{?_with_qt} \ %{?_with_gtk2} \ %{?_with_gtk3} \ - %{?_with_qt} \ --disable-warnings-as-errors # Remove rpath. It's prohibited in Fedora[1] and anyway we don't need it (and @@ -223,11 +223,15 @@ make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install -%if %{with gtk3} || %{with gtk2} +# %if %{with gtk3} || %{with gtk2} +# # Change the program name for 'alternatives' +# mv %{buildroot}%{_bindir}/wireshark %{buildroot}%{_bindir}/wireshark-gtk +# %endif +%if %{with qt} # Change the program name for 'alternatives' -mv %{buildroot}%{_bindir}/wireshark %{buildroot}%{_bindir}/wireshark-gtk +mv %{buildroot}%{_bindir}/wireshark %{buildroot}%{_bindir}/wireshark-qt %endif -%if %{with gtk2} || %{with gtk3} || %{with qt} +%if %{with qt} || %{with gtk2} || %{with gtk3} # Create the 'alternative' file touch %{buildroot}%{_bindir}/wireshark make DESTDIR=$RPM_BUILD_ROOT install_desktop_files @@ -261,39 +265,39 @@ fi %postun -p /sbin/ldconfig -%if %{with gtk2} || %{with gtk3} -%post gnome +%if %{with qt} +%post qt update-desktop-database &> /dev/null ||: update-mime-database /usr/share/mime &> /dev/null || : touch --no-create /usr/share/icons/hicolor &>/dev/null || : /usr/sbin/update-alternatives --install %{_bindir}/wireshark \ - %{name} %{_bindir}/wireshark-gtk 50 + %{name} %{_bindir}/wireshark-qt 50 -%postun gnome +%postun qt update-desktop-database &> /dev/null ||: 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 || : - /usr/sbin/update-alternatives --remove %{name} %{_bindir}/wireshark-gtk + /usr/sbin/update-alternatives --remove %{name} %{_bindir}/wireshark-qt fi %endif -%if %{with qt} -%post qt +%if %{with gtk2} || %{with gtk3} +%post gnome update-desktop-database &> /dev/null ||: update-mime-database /usr/share/mime &> /dev/null || : touch --no-create /usr/share/icons/hicolor &>/dev/null || : /usr/sbin/update-alternatives --install %{_bindir}/wireshark \ - %{name} %{_bindir}/wireshark-qt 10 + %{name} %{_bindir}/wireshark-gtk 10 -%postun qt +%postun gnome update-desktop-database &> /dev/null ||: 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 || : - /usr/sbin/update-alternatives --remove %{name} %{_bindir}/wireshark-qt + /usr/sbin/update-alternatives --remove %{name} %{_bindir}/wireshark-gtk fi %endif @@ -346,31 +350,35 @@ gtk-update-icon-cache /usr/share/icons/hicolor &>/dev/null || : %{_mandir}/man4/* %{_datadir}/wireshark -%if %{with gtk2} || %{with gtk3} -%files gnome +%if %{with qt} +%files qt %defattr(-,root,root) /usr/share/applications/wireshark.desktop /usr/share/icons/hicolor/*/apps/* /usr/share/icons/hicolor/*/mimetypes/* /usr/share/mime/packages/wireshark.xml -%{_bindir}/wireshark-gtk +%{_bindir}/wireshark-qt %{_mandir}/man1/wireshark.* %ghost %{_bindir}/wireshark %endif -%if %{with qt} -%files qt +%if %{with gtk2} || %{with gtk3} +%files gnome %defattr(-,root,root) /usr/share/applications/wireshark.desktop /usr/share/icons/hicolor/*/apps/* /usr/share/icons/hicolor/*/mimetypes/* /usr/share/mime/packages/wireshark.xml -%{_bindir}/wireshark-qt +%{_bindir}/wireshark-gtk %{_mandir}/man1/wireshark.* %ghost %{_bindir}/wireshark %endif %changelog +* Fri Aug 29 2014 Gerald Combs +- The Qt UI is now the default. Update logic and prioritization to + reflect this. + * Mon Aug 4 2014 Jeff Morriss - Fix RPM builds with a prefix other than /usr: The location of update-alternatives does not depend on Wireshark's installation prefix: |