Commit Graph

50 Commits

Author SHA1 Message Date
Guy Harris adb28bd812 The capabilities for dumpcap don't need to be inheritable.
See

	https://bugzilla.redhat.com/show_bug.cgi?id=1022377

svn path=/trunk/; revision=54630
2014-01-07 21:21:20 +00:00
Chris Maynard 1bd68e7adb Trivial: Fix typo.
svn path=/trunk/; revision=53937
2013-12-11 15:20:29 +00:00
Jeff Morriss 69017ac3bd Overhaul rpm-building options a bit: as suggested by Anders, have the RPM follow
./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-26 23:43:18 +00:00
Jeff Morriss ebc4cbc74e Attempt to fix Qt dependencies for SUSE.
svn path=/trunk/; revision=53490
2013-11-21 20:20:29 +00:00
Jeff Morriss 6b7ab3bd33 Make subpackage Requires: more generic.
svn path=/trunk/; revision=53300
2013-11-13 16:16:06 +00:00
Jeff Morriss 78f8757560 Add a (wireshark-)qt package that contains the Qt-based GUI (and the necessary
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-11-13 03:01:42 +00:00
Jeff Morriss c90d29c668 As pointed out by Kurt in 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-09-20 20:52:04 +00:00
Jeff Morriss a995cb8220 Simplify the check for rpmbuild's version.
svn path=/trunk/; revision=48612
2013-03-28 14:17:38 +00:00
Jeff Morriss 041fbc05ed SuSE's suse_update_desktop_file macro BuildRequires update-desktop-files.
svn path=/trunk/; revision=48298
2013-03-14 16:56:19 +00:00
Jeff Morriss 6eb2e2899a freekdesktop.org says all themes must fall back to 'hicolor' if they don't find
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-08 23:40:37 +00:00
Jeff Morriss 45a75522ed List more (obvious) build dependencies.
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-07 03:50:28 +00:00
Gerald Combs ed0d988323 Update the changelog.
svn path=/trunk/; revision=48151
2013-03-06 23:06:09 +00:00
Gerald Combs e5e1372d7e Enable c-ares support by default to match the Windows and Debian
packages (and to make things less painful if the user enables name
resolution). Untested.

svn path=/trunk/; revision=48150
2013-03-06 23:04:43 +00:00
Jeff Morriss 663e6a6d6b Make it so that alternate-prefix RPM builds actually work.
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-28 23:02:38 +00:00
Jeff Morriss 98ce5836a4 Add a %prefix option for users who want to (easily) configure Wireshark to
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-27 16:12:19 +00:00
Jeff Morriss 6484e0c9f7 Perl is required to build Wireshark, add it to BuildRequires.
svn path=/trunk/; revision=47531
2013-02-07 16:33:17 +00:00
Jeff Morriss f24dafa0f5 Overhaul to make this file more useful/up to date. Many changes are based on
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
2013-02-07 03:09:47 +00:00
Guy Harris fe37c0ccb8 Add @configure_input@ to a bunch of .in files that didn't have it.
Add $Id$ to those of said files that didn't have it, and fix one $Id to
be $Id$.

svn path=/trunk/; revision=41594
2012-03-16 03:39:51 +00:00
Bill Meier d1b6eacf21 Add $Id$; Fix some properties.
svn path=/trunk/; revision=34996
2010-11-21 19:03:17 +00:00
Bill Meier 19beda3aff Change "Source" to use http://wireshark.org/download/automated/src/...
i

svn path=/trunk/; revision=31483
2010-01-10 19:40:18 +00:00
Bill Meier bb1873f343 Fix 'make rpm-package' so it works again ...
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
2010-01-10 19:24:26 +00:00
Jörg Mayer 5667e75a50 Get rid of FAQ file completely: It's still available as help/faq.txt
svn path=/trunk/; revision=27359
2009-02-03 08:49:03 +00:00
Jörg Mayer a4dc607922 configure seems to install the manpages into .../share/man/, not .../man/
svn path=/trunk/; revision=25033
2008-04-15 01:26:02 +00:00
Jörg Mayer f1803c788e As reported by Chris Maynard:
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-08-10 12:29:21 +00:00
Gerald Combs d704554ee2 Ethereal -> Wireshark
svn path=/trunk/; revision=18370
2006-06-06 23:11:31 +00:00
Gerald Combs a4a7e7c4f9 Icon cleanup.
svn path=/trunk/; revision=18350
2006-06-05 19:32:44 +00:00
Gerald Combs 6a14b9a383 Fix dist/distcheck.
svn path=/trunk/; revision=18302
2006-06-01 14:28:13 +00:00
Gerald Combs eb71f7fb96 Rename the main executable to "wireshark", along with more conversions:
ethereal.com -> wireshark.org
  mailing lists and addresses
  ETHEREAL -> WIRESHARK
  Man pages
  Automake/Autoconf names


svn path=/trunk/; revision=18271
2006-05-31 19:12:15 +00:00
Ronnie Sahlberg f0b33a4789 ethereal->wireshark updates
svn path=/trunk/; revision=18206
2006-05-22 08:14:01 +00:00
Gerald Combs 40101cf2b1 Update RPM builds.
svn path=/trunk/; revision=15165
2005-08-01 18:04:37 +00:00
Jörg Mayer 5b442f2279 After doing "make maintainer-clean", "svn status --no-ignore | grep ^I"
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-07-10 08:04:27 +00:00
Anders Broman 86226ad09f From Mike Duigou:
Fixes a problem with the RPM spec which prevents it from 
working with current versions of rpmbuild.

svn path=/trunk/; revision=14539
2005-06-03 06:37:05 +00:00
Jörg Mayer f88578cbc0 Build with ssl and kerberos
svn path=/trunk/; revision=12726
2004-12-12 15:22:41 +00:00
Jörg Mayer dacfa8f1a4 Make building rpms possible again. Feedback for improvements welcome.
svn path=/trunk/; revision=11446
2004-07-20 19:55:01 +00:00
Jörg Mayer fd24ad7d92 .cvsignore is dead
it has been replaced by
svn proplist -v <dir/file>
and
svn propedit <dir/file>

svn path=/trunk/; revision=11422
2004-07-18 23:44:34 +00:00
Jörg Mayer a460517f46 Beginnings to make rpm building possible again.
Not yet finished:
- make dist breaks after moving of dissectors
- the real packaging process may not be working yet

svn path=/trunk/; revision=11421
2004-07-18 23:39:15 +00:00
Jörg Mayer 56c759212f Add epan/dissectors/.cvsignore
Add tags and TAGS to all .cvsignore files

svn path=/trunk/; revision=11419
2004-07-18 22:51:50 +00:00
Jörg Mayer cafe878cd7 Include shared libs if they exist
svn path=/trunk/; revision=10272
2004-03-01 22:39:34 +00:00
Jörg Mayer 7bc43b4170 Forgot the RPMS directory in the .cvsignore.
svn path=/trunk/; revision=6030
2002-08-20 01:12:40 +00:00
Jörg Mayer adccfb88ae Small cleanups to the rpm building process:
- Don't fail if the intermediate directories BUILD, SOURCE, SRPMS already
  exist.
- Add these directories to .cvsignore.

svn path=/trunk/; revision=6029
2002-08-20 01:06:29 +00:00
Jörg Mayer 15c6107d19 Add the FAQ to the packages.
svn path=/trunk/; revision=6028
2002-08-20 00:59:42 +00:00
Guy Harris 64c8032c3b "ethereal.spec" is now in the "packaging/rpm/SPECS" directory, so remove
it from the .cvsignore file in the "packaging/rpm" directory.

svn path=/trunk/; revision=4585
2002-01-21 07:24:14 +00:00
Guy Harris 9fb6b48a49 Add a .cvsignore file.
svn path=/trunk/; revision=4584
2002-01-21 07:22:58 +00:00
Gerald Combs b11f1955e4 Revamp the RPM building process. For versions of rpm that support
"--define", we now build the RPM and SRPM packages in packages/rpm.
As a result, one need not be root to build RPM-based packages.

Move the specfile to packaging/rpm/SPECS.

Update the INSTALL document to include the various packaging makefile
targets.

svn path=/trunk/; revision=4581
2002-01-20 23:05:25 +00:00
Guy Harris a93f4f8515 Add the Diameter dictionary stuff to the list of installed files.
Also mark those files as configuration files; "dictionary.xml" should
definitely be one, as it could be modified by the administrator if other
XML dictionary files are added to the list at the end, and the other
ones might be modified if there are any protocol changes.

svn path=/trunk/; revision=4389
2001-12-12 08:00:35 +00:00
Guy Harris 516c93c5e3 From Craig Rodrigues: changes to handle current versions of RPM, which
compress man pages.

svn path=/trunk/; revision=3567
2001-06-18 07:21:30 +00:00
Gilbert Ramirez 90e0fb129d Change Ethereal homepage URL from etheral.zing.org to www.ethereal.com.
svn path=/trunk/; revision=2696
2000-11-22 04:07:04 +00:00
Guy Harris 9fb66f8e93 Update and add ".cvsignore" files to reduce the level of noise from CVS.
svn path=/trunk/; revision=2179
2000-07-30 08:32:54 +00:00
Gerald Combs 1cbca8fb96 Remove some "Makefile.in"s that I accidentally committed last night.
svn path=/trunk/; revision=2166
2000-07-26 14:00:41 +00:00
Gerald Combs 7baf3c1730 Switch Solaris package build naming to a more generic SVR4. Add RPM and SRPM
package build targets.  Move ethereal.spec(.in) to packaging/rpm.

The spec file is different from Henri's.  We might want to switch to his
for the sake of consistency.

svn path=/trunk/; revision=2162
2000-07-26 03:39:11 +00:00