aboutsummaryrefslogtreecommitdiffstats
path: root/packaging/rpm
AgeCommit message (Collapse)AuthorFilesLines
2019-02-10RPM: respect options for disabling Qt, SpanDSP and BCG729Peter Wu1-2/+2
"%bcond_without" enables a feature by default. Be sure to explicitly disable features to match the requested configuration. Change-Id: I90687f35bcd953670e147be9e70af03aaeaef5dc Ping-Bug: 14606 Reviewed-on: https://code.wireshark.org/review/31933 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-02-05rpm: unconditionally add doc files.Dario Lombardo1-8/+0
The doc files have been added in v2.9.1rc0-618-g1bb1ffa9ca, and since then, rpm builds complain: RPM build errors: File listed twice: /usr/local/bin/dumpcap Installed (but unpackaged) file(s) found: /usr/local/share/doc/wireshark/androiddump.html /usr/local/share/doc/wireshark/capinfos.html /usr/local/share/doc/wireshark/captype.html [cut] The "with ninja" condition has been removed as well since it leads to a dead end. Change-Id: I95185ba8cb0d488a7fd222c04ff7ff2a637a817a Reviewed-on: https://code.wireshark.org/review/31873 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Dario Lombardo <lomato@gmail.com>
2019-01-14RPM: remove dependency on the which utilityPeter Wu1-2/+2
It is not necessary to know the full path to a program. Instead use the 'type' shell builtin (part of POSIX) to detect availability. Change-Id: Id68b298625d389a1f7843f52f56312bf81d97b80 Reviewed-on: https://code.wireshark.org/review/31540 Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-01-14tarball+RPM: Fetch our version from CMake.Gerald Combs1-2/+1
Move git-export-release.sh to packaging/source. Have the source and RPM packaging derive version information from CMake's VERSION variable. This brings them in line with the rest of our packaging and avoids having to read chicken entrails^W^Wgit output. Make sure we always generate wireshark.spec. Bug: 15359 Change-Id: I188efda489c94449a10a612abebf9c2872c305cb Reviewed-on: https://code.wireshark.org/review/31504 Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-11-08rpm: update all rpm files for using python3.Dario Lombardo1-1/+2
This includes: - tools/rpm-setup.sh - packaging/rpm/wireshark.spec.in Fixes: v2.9.0rc0-2460-ge9f7bb5127 ("Require Python 3, drop Python 2 support") Change-Id: I9fb92be936dec5fdb819a54e132e64521fa95bbb Reviewed-on: https://code.wireshark.org/review/30543 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com> Reviewed-by: Dario Lombardo <lomato@gmail.com>
2018-11-07Require Python 3, drop Python 2 supportPeter Wu1-1/+1
Python 3 is widely available. All major Linux distributions support it. RHEL is covered via EPEL (which is already required for cmake3). Drop support for Python 2 in order to reduce maintenance costs. The main motivation is being able to simplify the tests. CMake is updated to search for Python >= 3.4 and will fail if unavailable (generating dissectors.c requires Python, so it is quite an important piece to have). The documentation is updated to reflect the Python 3.7 paths used by Chocolatey. Tested the git-review installation instructions in Windows 7 x64 without a previous Chocolatey installation. macOS brew now installs Python 3 (its dependencies are already installed by python@2 for libxml2). The macOS (non-brew variant) is updated to use the official 64-bit installer to install Python 3. Change-Id: I80b1e36957f338e0dad1bfcc173b6418682cddba Reviewed-on: https://code.wireshark.org/review/30192 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-10-01Add a systemd Journal Export extcap.Gerald Combs1-0/+18
Add an sdjournal extcap, which reads journal entries using the sd-journal API and dumps them as journal Export Format records. Change-Id: I17ccfa88ab5d053c16c869cd26e580d84022502e Reviewed-on: https://code.wireshark.org/review/29479 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-09-28RPM: obsolete the gnome and gtk packages; allow user to set prefix.Jeff Morriss1-17/+15
Obsoleting the gtk packages allows a clean upgrade to the Qt version (without requiring the user to manually remove those packages). Set the install prefix based on what the user set when running cmake (like we did with autotools). Change-Id: Ica283f40bc002951af4ff1f9d719295c0a598c3b Reviewed-on: https://code.wireshark.org/review/29892 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-09-27RPM: move the installed development files to a new -devel packageJeff Morriss1-31/+43
Development-related files (header files, cmake files, the pkg-config file) don't belong in the base RPM. This moves those ~600 files (~4 MiB) to a separate RPM for those who may want them. Also clean up a few other things in the SPEC file while here to make things more readable and consistent. Change-Id: I89f93a8696c54b9117595f1da9f856c080853dce Reviewed-on: https://code.wireshark.org/review/29814 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-09-24RPM: optionally use ccache to speed up (re)builds.Jeff Morriss1-1/+8
Installing and enabling ccache makes testing RPM builds (which always do a complete build) much less painful. Change-Id: Ie9ab1794614701cdbe261089f81398c2b7d1f027 Reviewed-on: https://code.wireshark.org/review/29812 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-09-24RPM: Make the (optional) maxminddb dependencies actually work.Jeff Morriss1-10/+11
Move the maxminddb dependencies out of if(qt) and above the RPM's description; this makes them actually work and takes the RPM code for those dependencies out of the Qt RPM's Description (where they clearly weren't doing any good). Change-Id: I01705f8f5f6435571cf521b68f8450730ddaa383 Reviewed-on: https://code.wireshark.org/review/29808 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2018-06-09rpm: fix compilation on centos (uses cmake3).Dario Lombardo1-1/+9
Change-Id: Ia0319658a0e8c9d8e13595d6773dcd6438228bda Reviewed-on: https://code.wireshark.org/review/28112 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-05-15CMake: require at least CMake 3.5Peter Wu1-1/+1
CMake 3.11 with the Ninja generator started complaining about CMP0058 related to ui/qt/CMakeFiles/qtui_autogen.dir/RCCstock_iconsInfo.cmake amd other files (AUTORCC). While the policy could be set explicitly, let's try to modernize the CMake configuration: - Drop CMP0042, if this gives issues with macOS, then it must be solved in a different way using non-deprecated methods. - Drop CMP0054 and ensure that all if("${foo}") and if(${foo}) are converted to if(foo). - Remove string comparison against "-NOTFOUND", it already evaluates to false in an if condition. - Use CXX_STANDARD/CXX_STANDARD_REQUIRED for Qt 5.7 and newer. - Assume that copy_if_different can accept multiple sources (CMake 3.5). - Consistency: Out of the 60 CMake 3.11 FindXxx.cmake files that use find_library, 34 contain "XXX_LIBRAR" while 16 contain "Xxx_LIBRAR". Let's assume uppercase variables (now custom MaxMindDB include dirs are correctly used). CMake 3.5 was chosen as the next version because of its wide support. Ubuntu 14.04 ships with cmake3 3.5.1, Debian jessie-backports has 3.6.2, EPEL for CentOS/RHEL6 includes cmake3 3.6.1 and SLES12 SP2 has 3.5. Change-Id: I2fa7b94bf8cc78411f414987d17bab3a33dfb360 Reviewed-on: https://code.wireshark.org/review/27444 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-05-02rpm-package: Use version.h to generate version string in RPMAndersBroman1-1/+1
Packaging. Change-Id: I463be4523f789406ff0cb3a1a325d6937db63b3d Reviewed-on: https://code.wireshark.org/review/27179 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-24RPM: remove packaging/rpm/SPECS/wireshark.spec.in.Dario Lombardo1-631/+0
Not used anymore. Change-Id: I22dd0ad073059064630f7a7683b82724e2bfa452 Reviewed-on: https://code.wireshark.org/review/27117 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-04-18Remove autotools build system.Dario Lombardo4-37/+2
It has been replaced by cmake. Change-Id: I83a5eddb8645dbbf6bca9f026066d2e995d8e87a Reviewed-on: https://code.wireshark.org/review/26969 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-16RPM: restore the bindir in openSUSE before packing.Dario Lombardo1-0/+6
Change-Id: I6e60d1a299528c0f1603b56704a8c47f18c66d08 Reviewed-on: https://code.wireshark.org/review/26926 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-16RPM: install wireshark.desktop in /usr/share/applications.Dario Lombardo1-0/+4
The presence of this file in /usr/share/applications in required by suse_update_desktop_file, as described here: https://en.opensuse.org/openSUSE:Packaging_Conventions_RPM_Macros#.25suse_update_desktop_file Change-Id: I88573afca2d4523a1b305bf4dc672c421c2fa1d1 Reviewed-on: https://code.wireshark.org/review/26925 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-16RPM: cd into build dir in openSUSE.Dario Lombardo1-0/+6
This step is needed because of the differences in the %cmake macro between Fedora/Centos and openSUSE. Change-Id: I7ac94e560b4c298934f78e96036a814f3eadc4a5 Reviewed-on: https://code.wireshark.org/review/26924 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-11RPM: don't give the cmake macro the directory (it has it already).Dario Lombardo1-1/+0
Change-Id: I1c3febf527f16825793a30eb2ab5d43baaa83a57 Reviewed-on: https://code.wireshark.org/review/26880 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-11RPM: set the cmake bindir in openSUSE.Dario Lombardo1-0/+5
Change-Id: I41edf52f8021938877bc53dd5eea4ff29cf4827e Reviewed-on: https://code.wireshark.org/review/26878 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-11RPM: set ninja executable in %install target.Dario Lombardo1-0/+1
It is not inherited by previous target. Change-Id: I11be59211a900375e02fce8c05cc4164b8dc42e4 Reviewed-on: https://code.wireshark.org/review/26877 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-11RPM: fix typo.Dario Lombardo1-1/+1
Change-Id: I2e82fb0696e2e7cb636ec1fdfb72a566e0eca94f Reviewed-on: https://code.wireshark.org/review/26879 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Dario Lombardo <lomato@gmail.com>
2018-04-11RPM: don't install doc under guides with make.Dario Lombardo1-2/+2
Change-Id: Iaa8f3d941dcb329bbfff28f6d9417b92d44371e1 Reviewed-on: https://code.wireshark.org/review/26876 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-11RPM: Make documentation installation optional.Gerald Combs1-3/+17
Add a "guides" bcond so that we can make Asciidoctor and the HTML guide installation optional. Change-Id: I5f9e6cc59689dba7d600cc721547aed020652f00 Reviewed-on: https://code.wireshark.org/review/26867 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-11RPM: support multiple ninja executables.Dario Lombardo1-3/+7
Support ninja and ninja-build (Centos7) so far. Change-Id: I846a0645f24f6cfdc83bd725827d1681a5a1f174 Reviewed-on: https://code.wireshark.org/review/26856 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-11RPM: install guides when using make.Dario Lombardo1-0/+1
Change-Id: I89ca826f39dea3f53b94a87ccc2fbe3f9bb4a2b1 Reviewed-on: https://code.wireshark.org/review/26861 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-09Autotools: More Qt4 removal.Gerald Combs1-1/+1
Change-Id: I6609160530d2e2f0ca47c324de48aa659c253bcf Reviewed-on: https://code.wireshark.org/review/26812 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Roland Knall <rknall@gmail.com>
2018-04-04CMake RPM build: Try to get rid of %globals in favor of %bcond.Anders1-18/+16
Change-Id: I051fb722b0c4161b373f04a79288faa41a61c3cc Reviewed-on: https://code.wireshark.org/review/26735 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-03-26CMake: Add an rpm-package target.Gerald Combs2-0/+551
Copy the current wireshark.spec.in and update it for use with CMake. Remove the Qt4, GTK+2, and GTK+3 options. Add Ninja and mmdbresolve options. The rpm-package target builds a tarball using git-export-release.sh and therefore must be run from a git checkout. The RPM _prefix macro is set to CMAKE_INSTALL_PREFIX, so you'll probably want to run cmake -DCMAKE_INSTALL_PREFIX=/usr ... Change-Id: Ib014494d8858a0059126404cd91528ded5d8a9f6 Reviewed-on: https://code.wireshark.org/review/26579 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-03-06Transition from GeoIP Legacy to MaxMindDB.Gerald Combs1-2/+2
MaxMind is discontinuing its legacy databases in April in favor of GeoIP2, which use a newer database format (MaxMind DB). The reference C library (libmaxminddb) is available under the Apache 2.0 license which isn't quite compatible with ours. Add mmdbresolve, a utility that reads IPv4 and IPv6 addresses on stdin and prints resolved information on stdout. Place it under a liberal license (MIT) so that we can keep libmaxminddb at arm's length. Add epan/maxmind_db.[ch], which spawns mmdbresolve and communicates with it via stdio. Migrate the preferences and documentation to MaxMindDB. Change the IPv4 and IPv6 asnum fields to FT_UINT32s. Change the geographic coordinate fields to FT_DOUBLEs. Bug: 10658 Change-Id: I24aeed637bea1b41d173270bda413af230f4425f Reviewed-on: https://code.wireshark.org/review/26214 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-12-13Fix RPM build: include the User Guide.Jeff Morriss1-0/+8
The User Guide has been installed by default since I9dd539c737cb3777dc1351707b9e45a3a6764aaa. Fixes problem reported in: https://www.wireshark.org/lists/wireshark-dev/201711/msg00162.html Change-Id: I462c7c18869e8df93785e1898364e248e897de50 Reviewed-on: https://code.wireshark.org/review/24679 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-10-15packaging: Fix RPM spec fileJoão Valverde1-1/+2
Change-Id: Ib05cfeb9ef553ebd69e388e6ba00ddf751deb686 Reviewed-on: https://code.wireshark.org/review/23934 Reviewed-by: João Valverde <j@v6e.pt>
2017-10-15autotools: refresh rpm-package targetJoão Valverde1-1/+9
There's only so much we can/should do here, so dispense with the _topdir test. Change-Id: Ibf1170ea2cbb7c536df901db42d67da668fd64b2 Reviewed-on: https://code.wireshark.org/review/23912 Reviewed-by: João Valverde <j@v6e.pt>
2017-10-15autotools: make maintainer-clean should allow rerunning 'configure'João Valverde2-5/+0
Change-Id: Iedae94ffefe27b13b1967d69cacb757b5aa4576d Reviewed-on: https://code.wireshark.org/review/23928 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2017-07-30Add G.729 decoding based on bcg729 libraryPascal Quantin1-0/+11
Bug: 13635 Change-Id: Ic22a0719a59da13e51425aeb747e88caca0d6512 Reviewed-on: https://code.wireshark.org/review/22808 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-04-19Add libxml2 as optional dependencyAhmad Fatoum1-0/+13
This can be used by dissectors that need to parse out-of-band configuration. Change-Id: I13c0a2f408fb5c21bad7ab3d7971e0fa8ed7d783 Reviewed-on: https://code.wireshark.org/review/20912 Reviewed-by: Roland Knall <rknall@gmail.com>
2016-12-21[rpm-build] Add an option to exclude extcap.AndersBroman1-0/+9
Change-Id: Ibe16ad31986818fcd6e1bfbcfdd38ecc7663dd39 Reviewed-on: https://code.wireshark.org/review/19360 Reviewed-by: Anders Broman <a.broman58@gmail.com> Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2016-12-06codecs: Add support for G.722 and G.726Peter Wu1-0/+11
Integrate the Spandsp library for G.722 and G.726 support. Adds support for G.722 and all eight variants of G.726. Note: this also fixes a crash in Qt (buffer overrun, reading too much data) caused by confusion of the larger output buffer (resample_buff) with the smaller input buffer (decode_buff). It was not triggered before because the sample rate was always 8k, but with the addition of the new codecs, a different sample rate became possible (16k). Fix also a crash which occurs when the RTP_STREAM_DEBUG macro is enabled and the VOIP Calls dialog is opened (the begin frame, start_fd, is not yet known and therfore a NULL dereference could occur). Passes testing (plays normally without bad RTP timing errors) with SampleCaptures files: sip-rtp-g722.pcap and sip-rtp-g726.pcap. Tested with cmake (Qt), autotools (Qt and GTK+) with ASAN enabled. Bug: 5619 Change-Id: I5661908d193927bba50901079119eeff0c04991f Reviewed-on: https://code.wireshark.org/review/18939 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-12-01RPM: fix the date in a recent changelog entry.Jeff Morriss1-1/+1
RPM complains when the date isn't valid. Change-Id: I859a9900ba87d52159071b06310d5873c092231a Reviewed-on: https://code.wireshark.org/review/19003 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2016-11-02Packaging: Add dependencies for lz4 and snappy packagesBenoît Canet1-0/+18
Do it for Debian-like, RPM-based, and MacOS (via Homebrew) systems. Signed-off-by: Benoît Canet <benoit@scylladb.com> Signed-off-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Change-Id: I52802301815243021c039da6a27af6c534792439 Reviewed-on: https://code.wireshark.org/review/18272 Reviewed-by: Benoît Canet <benoit@scylladb.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com> Reviewed-by: Dario Lombardo <lomato@gmail.com>
2016-10-13Remove nghttp2 code and use system' nghttp2Balint Reczey1-0/+10
Update debian, macos (setup / homebrew) download script Update testsuite (don't try HPACK when build without nghttp2) Change-Id: I365e5e17bc4fab4acd81b4c39ea7189a5d1ee112 Reviewed-on: https://code.wireshark.org/review/17347 Reviewed-by: Gerald Combs <gerald@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-08-17RPM: distribute the wireshark.pc file.Jeff Morriss1-0/+4
It's been installed since Idb60157a51ea1dd0afd6cfac695bfa5760485241. Change-Id: I2171f2a0bc9b05059b8ecf4451715f7f6d9506e3 Reviewed-on: https://code.wireshark.org/review/17113 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2016-08-02RPM: Download from https://www.wireshark.org/.Gerald Combs1-2/+2
Download from https://www.wireshark.org/ instead of https://wireshark.org/. This conforms to README.packaging and avoids a redirect. Change-Id: I0ed63f446bc16cbd501444c8743809672c4a084b Reviewed-on: https://code.wireshark.org/review/16829 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-07-29Use xz to compress the source tarball.Gerald Combs1-2/+2
Compress the source tarball using xz instead of bzip2. Other open source projects (including many of our dependencies) have been using xz for a while so hopefully this won't be too much of a shock. Remove the patch-bzip2 Autotools target while we're here. Change-Id: I456d27b6cd56a43aba829bd45938f98568eb7b1d Reviewed-on: https://code.wireshark.org/review/16735 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2016-06-30Remove Makefile.common filesJoão Valverde1-2/+2
Now that nmake build system has been removed they are not needed anymore. Change-Id: I88075f955bb4349185859c1af4be22e53de5850f Reviewed-on: https://code.wireshark.org/review/16050 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2016-05-12RPM: make autoconf (and a few other build dependencies) optional.Jeff Morriss1-4/+21
Most people building RPMs don't need autoconf, automake, flex, or bison. But enough people do patch Wireshark (in the spec file) to make it an option. Based on Joao's Ib3f85b59c26c25c83fe6a939aee1a2dc75dd28f9. Change-Id: I62bf2a0c5cbe0a1abd680322ab82fcb14aedd0c3 Reviewed-on: https://code.wireshark.org/review/15313 Reviewed-by: João Valverde <j@v6e.pt> Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2016-04-25Another fix for RPM spec file version stringJoão Valverde1-1/+1
Change-Id: I424640867173ccd5655b4cefb457d76f845e7966 Reviewed-on: https://code.wireshark.org/review/15111 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2016-04-23autotools: Fix rpm-package targetJoão Valverde1-4/+6
Change-Id: I6012199370a17d534ba7633509cd95c8a81aaebd Reviewed-on: https://code.wireshark.org/review/15062 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2016-04-14Update the RPM packaging to use the new Gtk ./configure optionsJeff Morriss1-5/+4
Follow-up to I0a6cd56f92b0f7dc8f06aa93f36622887d506fb5. Change-Id: Ie5bcffb84b1d6298b2d0f93205491c9a10b603c5 Reviewed-on: https://code.wireshark.org/review/14907 Reviewed-by: João Valverde <j@v6e.pt> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>