aboutsummaryrefslogtreecommitdiffstats
path: root/packaging/rpm/SPECS
AgeCommit message (Collapse)AuthorFilesLines
2015-09-14Begin support for Qt5 in RPM packagingJeffrey Smith1-6/+37
The spec file for building RPM's is not currently set up to handle using Qt5 rather than Qt4. This change adds Qt5 support to the spec file. Change-Id: Ie726603377953bec41692a21148325829a26ba9a Reviewed-on: https://code.wireshark.org/review/10276 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2015-02-18Add an appdata entry for Wireshark.Jeff Morriss1-0/+7
Based on the one from Richard Hughes. A French translation of the description field is included. Links to two screenshots are provided--they are stored in my home directory on wireshark.org (for lack of a better place that I can put them). Bug: 10479 Change-Id: Ida9b9e46c0fb23a7baff50f98afa597b25b8ca54 Reviewed-on: https://code.wireshark.org/review/4178 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2015-01-22Add a changelog entry for the license tag change ↵Jeff Morriss1-1/+4
(I82de1bc4ffcb1e962b1a35dc58aaa87aca04ed5e). Change-Id: I5e715579be9b415cd0fd957c66c7bd82319c88b3 Reviewed-on: https://code.wireshark.org/review/6743 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2015-01-21Make the license tag in the RPM more specific: Wireshark is GPLv2+.Jeff Morriss1-1/+1
Change-Id: I82de1bc4ffcb1e962b1a35dc58aaa87aca04ed5e Reviewed-on: https://code.wireshark.org/review/6701 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-21Modernize the description of Wireshark given in the RPM info.Jeff Morriss1-12/+18
The initial suggestions came from Michal Labedzki on https://code.wireshark.org/review/#/c/4178 Change-Id: Iae04d667f70ae73b46d2edc1645c238ef6efc518 Reviewed-on: https://code.wireshark.org/review/6511 Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com> Reviewed-by: Niels de Vos <devos@fedoraproject.org> Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-12-04Fix building of RPMs and get RPM builds working with a prefix other than ↵Jeff Morriss1-23/+25
/usr again. (Change I567269d8e45e6543d9e39dbedc49830adf7edb9f made the desktop files install outside of /usr/share/ .) RPMs now build and work regardless of the prefix but the desktop integration stuff only works if the prefix is /usr or (if you're lucky) /usr/local . Change-Id: If20e0127a044eac1ba099f959a90d068c4bb2ae5 Reviewed-on: https://code.wireshark.org/review/5600 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-12-04Tell the loader where to find our libraries if we're being installedJeff Morriss1-9/+14
someplace other than /usr . Change-Id: I42cbe98bcfc0e8ba2aa08f651044db051d31205c (cherry picked from commit 25d9695cb3536b672f4cd8bc280e2a3c816a0d8a) Conflicts: packaging/rpm/SPECS/wireshark.spec.in Reviewed-on: https://code.wireshark.org/review/5605 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-12-03Don't run gtk-update-icon-cache when uninstalling the Qt package. But do runJeff Morriss1-2/+5
it when installing the gnome package. Change-Id: I0bbd9c0edc3fb6fe0e672aa3dbea5ba23d847d87 Reviewed-on: https://code.wireshark.org/review/5598 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-09-02Simplify ./configure logic for telling rpmbuild which GUI(s) we're building.Jeff Morriss1-3/+15
Rather than checking for all the "--with" arguments just use the "$have_xxx" variables. Don't allow rpmbuild's ./configure to decide to build a GUI just because it's available: make it build only what was ./configure'd. Change-Id: I68582b4c13da7b52d56591dce68ac426e9f607f1 Reviewed-on: https://code.wireshark.org/review/3958 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-09-02Qt → wireshark. GTK+ → wireshark-gtk.Gerald Combs1-53/+61
Make sure the Qt UI is named "Wireshark" and its executable is named "wireshark" or "wireshark.exe". Make sure the GTK+ UI is named "Wireshark 1" or "Wireshark (GTK+)" depending on how much the target audience is likely to care about UI toolkits. Make sure the GTK+ executable is named "wireshark-gtk" or "wireshark-gtk.exe". It looks like moving to Qt 5.3 (g978faf3) broke the PortableApps package. It's likely even more broken now. Autotools out-of-tree builds also broke on Ubuntu 12.02 (automake 1.11.3) at some point. The first attempt to compile in ui/qt returns "error: source_file.cpp: No such file or directory". The second attempt works. Out-of-tree builds work fine on Ubuntu 14.04 (automake 1.14.1). Tested: - Nmake builds - NSIS packaging - CMake builds (Windows, OS X) - Autotools build and distcheck - RPM packaging To do: - Test Debian packaging - Fix PortableApps Change-Id: I66429870e05fd2d6fc901942477959ed6164fce2 Reviewed-on: https://code.wireshark.org/review/3919 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-08-13Use a wildcard to exclude all Wireshark (GUI) binaries: rpmbuild in RHEL6Jeff Morriss1-4/+2
errors out if you %exclude a file that's not there. Fixes the issue reported by Chris on the -dev list. Change-Id: If8d8b6a9ee69c3d94756b729a809f3c04fc2517f Reviewed-on: https://code.wireshark.org/review/3586 Reviewed-by: Christopher Maynard <Christopher.Maynard@gtech.com> Petri-Dish: Christopher Maynard <Christopher.Maynard@gtech.com>
2014-08-05Fix some dates in the changelog; add some recent changes to the changelog.Jeff Morriss1-4/+18
Apparently rpmbuild now verifies the dates (including the day of the week) you entered. Change-Id: I1c67fb3170de3199b5fe5f8c117eaefb4d4d28c7 Reviewed-on: https://code.wireshark.org/review/3442 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-08-04Fix RPM builds with a prefix other than /usr.Jeff Morriss1-8/+8
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>
2014-08-01Remove the old wireshark binary during RPM upgrades.Jeff Morriss1-1/+7
If we have a pre-alternatives wireshark binary out there (e.g., because we're upgrading from wireshark-1.10 to wireshark-1.12), get rid of it in the %pre script. Otherwise the binary gets left there (because it's listed as a %ghost in the new spec file). Change-Id: I5828fcff486af3d269bad8dfe544c7659179bf5e Reviewed-on: https://code.wireshark.org/review/3332 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-07-01Get rid of rpath when we're building RPMs.Jeff Morriss1-0/+6
Fedora prohibits it, we don't need it, and it gets in the way some times. Change-Id: I92cee959f471866ff90efe9f96e4fa519c357dd9 Reviewed-on: https://code.wireshark.org/review/2763 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-07-01Fix buildroot.Jeff Morriss1-2/+3
Change-Id: I902db6c69ae5966da1102e4fbcfd9f46867c0b4f Reviewed-on: https://code.wireshark.org/review/2762 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-03-31Continue to remove $Id$ from top of fileAlexis La Goutte2-3/+0
(Using sed : sed -i '/^\# \$Id\$/,+1 d') (start with dash) Change-Id: Ia4b5a6c2302f6a531f6a86c1ec3a2f8205c8c2dd Reviewed-on: https://code.wireshark.org/review/881 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-01-07The capabilities for dumpcap don't need to be inheritable.Guy Harris1-2/+2
See https://bugzilla.redhat.com/show_bug.cgi?id=1022377 svn path=/trunk/; revision=54630
2013-12-11Trivial: Fix typo.Chris Maynard1-1/+1
svn path=/trunk/; revision=53937
2013-11-26Overhaul rpm-building options a bit: as suggested by Anders, have the RPM followJeff Morriss1-17/+28
./configure's options for gtk2 vs gtk3 vs qt. Make it possible to not build the GNOME package (now both UIs' packages are optional). I think Chris requested this a while ago. If this works out it may make sense to control the rest of the options via ./configure . svn path=/trunk/; revision=53607
2013-11-21Attempt to fix Qt dependencies for SUSE.Jeff Morriss1-0/+5
svn path=/trunk/; revision=53490
2013-11-13Make subpackage Requires: more generic.Jeff Morriss1-2/+2
svn path=/trunk/; revision=53300
2013-11-13Add a (wireshark-)qt package that contains the Qt-based GUI (and the necessaryJeff Morriss1-14/+87
desktop-integration files); build it by default. Use 'alternatives' to choose which GUI actually gets used; give the Gtk GUI priority over the Qt one (for now). svn path=/trunk/; revision=53297
2013-09-20As pointed out by Kurt in ↵Jeff Morriss1-0/+5
http://ask.wireshark.org/questions/24886/error-failed-build-dependencies-while-making-rpm : If we're not building with gtk3 we now need to add --with-gtk2 . svn path=/trunk/; revision=52161
2013-03-28Simplify the check for rpmbuild's version.Jeff Morriss1-6/+12
svn path=/trunk/; revision=48612
2013-03-14SuSE's suse_update_desktop_file macro BuildRequires update-desktop-files.Jeff Morriss1-0/+7
svn path=/trunk/; revision=48298
2013-03-08freekdesktop.org says all themes must fall back to 'hicolor' if they don't findJeff Morriss1-9/+13
a theme-specific icon (and as such hicolor is where applications should install their icons). So: don't install some of our icons in the gnome area, install them all in hicolor. While we're at it, go ahead and install all the icon sizes we have. If we're on SuSE, use their desktop-file-updater macro; without that they won't recognize our desktop file. Fix bug which prevented the MIME database from being updated if our install prefix is not /usr . svn path=/trunk/; revision=48204
2013-03-07List more (obvious) build dependencies.Jeff Morriss1-8/+36
The problem with listing these package names (which I think is convenient) is that different distros have different names for some packages. So: update to work on OpenSuSE. svn path=/trunk/; revision=48160
2013-03-06Update the changelog.Gerald Combs1-0/+3
svn path=/trunk/; revision=48151
2013-03-06Enable c-ares support by default to match the Windows and DebianGerald Combs1-3/+8
packages (and to make things less painful if the user enables name resolution). Untested. svn path=/trunk/; revision=48150
2013-02-28Make it so that alternate-prefix RPM builds actually work.Jeff Morriss1-5/+5
Use the prefix from 'configure' in the RPM (so: to build an RPM which installs in /opt do "./configure --prefix=/opt && make rpm-package"). (Maybe this approach should also be used for the other options in the .spec file.) Only clean up if building the RPM was successful. svn path=/trunk/; revision=47957
2013-02-27Add a %prefix option for users who want to (easily) configure Wireshark toJeff Morriss1-12/+19
install in a non-standard location. Assume the desktop-integration stuff goes in /usr (regardless of our prefix). This (with r47914) fixes RPM generation when someone uses a prefix other than /usr . Also: run desktop-file-validate on the wireshark.desktop file (just in case it wasn't installed with desktop-file-install). svn path=/trunk/; revision=47916
2013-02-07Perl is required to build Wireshark, add it to BuildRequires.Jeff Morriss1-3/+3
svn path=/trunk/; revision=47531
2013-02-07Overhaul to make this file more useful/up to date. Many changes are based onJeff Morriss1-22/+214
Fedora's .spec file. Changes include: - Create a separate wireshark-gnome package (like Redhat). - Control some things with variables set at the top of the file. - Allow the user to configure how dumpcap is installed. - Allow the user to choose some options including GTK2 or GTK3. - Greatly expand the BuildRequires entries; get the minimum versions of some things from 'configure'. - Install freedesktop files for better (free)desktop integration. svn path=/trunk/; revision=47528
2012-03-16Add @configure_input@ to a bunch of .in files that didn't have it.Guy Harris1-0/+2
Add $Id$ to those of said files that didn't have it, and fix one $Id to be $Id$. svn path=/trunk/; revision=41594
2010-11-21Add $Id$; Fix some properties.Bill Meier2-0/+3
svn path=/trunk/; revision=34996
2010-01-10Change "Source" to use http://wireshark.org/download/automated/src/...Bill Meier1-1/+1
i svn path=/trunk/; revision=31483
2010-01-10Fix 'make rpm-package' so it works again ...Bill Meier1-1/+1
Specifically: configure.in was changed in SVN 31068 to "Switch to .tar.bz2 for the "dist" target since that's what most people download". So: This patch has the required additional changes. svn path=/trunk/; revision=31481
2009-02-03Get rid of FAQ file completely: It's still available as help/faq.txtJörg Mayer1-1/+1
svn path=/trunk/; revision=27359
2008-04-15configure seems to install the manpages into .../share/man/, not .../man/Jörg Mayer1-1/+1
svn path=/trunk/; revision=25033
2006-08-10As reported by Chris Maynard:Jörg Mayer1-6/+5
wireshark was located in /usr/X11R6/bin while dumpcap int /usr/bin. That way wireshark couldn't find dumpcap. Install wireshark in the same path as dumpcap and tshark. svn path=/trunk/; revision=18874
2006-06-06Ethereal -> WiresharkGerald Combs1-1/+1
svn path=/trunk/; revision=18370
2006-06-05Icon cleanup.Gerald Combs1-5/+5
svn path=/trunk/; revision=18350
2006-06-01Fix dist/distcheck.Gerald Combs1-1/+1
svn path=/trunk/; revision=18302
2006-05-31Rename the main executable to "wireshark", along with more conversions:Gerald Combs1-4/+4
ethereal.com -> wireshark.org mailing lists and addresses ETHEREAL -> WIRESHARK Man pages Automake/Autoconf names svn path=/trunk/; revision=18271
2006-05-22ethereal->wireshark updatesRonnie Sahlberg1-1/+1
svn path=/trunk/; revision=18206
2005-08-01Update RPM builds.Gerald Combs1-4/+18
svn path=/trunk/; revision=15165
2005-07-10After doing "make maintainer-clean", "svn status --no-ignore | grep ^I"Jörg Mayer1-0/+3
returned quite a list of files. Add them to MAINTAINERCLEANFILES. Whitespace changes (replace multiple spaces by TABs, in a few cases this needed to be done at the beginning of Makefile lines. svn path=/trunk/; revision=14891
2005-06-03From Mike Duigou:Anders Broman1-1/+1
Fixes a problem with the RPM spec which prevents it from working with current versions of rpmbuild. svn path=/trunk/; revision=14539
2004-12-12Build with ssl and kerberosJörg Mayer1-3/+6
svn path=/trunk/; revision=12726
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-28 05:32:43 +0000