Commit Graph

9 Commits

Author SHA1 Message Date
Peter Wu 811d5f7fac Drop JSON-GLib completely
JSON-GLib was added in v2.9.0rc0-201-g511c2e166a, but is no longer
necessary since we have a home-grown JSON dumper (wsutil/json_dumper.h).
Remove the remaining traces and additionally remove GObject from
FindGLIB2.cmake since it was only added for JSON-GLib.

Change-Id: If9dfd2c60cec130f98109d100bdb6618bde06ba0
Reviewed-on: https://code.wireshark.org/review/30733
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-11-20 05:04:11 +00:00
Gerald Combs 8788c990b5 rpm-setup.sh: We no longer use FOP or AsciiDoc.
Change-Id: I3b6e200be149d12a42604528a695aae98d310b9c
Reviewed-on: https://code.wireshark.org/review/30719
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-11-19 20:54:15 +00:00
Dario Lombardo 50a0a78bd0 rpm: update all rpm files for using python3.
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-08 15:55:20 +00:00
Gerald Combs 1666d89107 Tools: Add systemd-devel to rpm-setup.sh.
Change-Id: Ib6599926146b58cff66dda978c61b6a705f7565d
Reviewed-on: https://code.wireshark.org/review/30000
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-10-03 19:33:38 +00:00
Dario Lombardo 2b1741ecd0 rpm-setup: add rpmbuild package.
Change-Id: Ic0041e150992c64a0b86614cf2d3c2a68abd5ab2
Reviewed-on: https://code.wireshark.org/review/28111
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-06-08 11:23:21 +00:00
Dario Lombardo e2ada3e687 rpm-setup: add support for opensuse non-interactive mode.
Change-Id: I3d32854c958d1369f5d475ce67c3932b9357a23f
Reviewed-on: https://code.wireshark.org/review/28110
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-06-08 11:22:58 +00:00
Dario Lombardo 63c62a2212 tools: update rpm-setup.
Add cmake3, ninja and g++ (required in docker).

Change-Id: I1ff4b09648cce0354d1fe60bd796d40348f284b7
Reviewed-on: https://code.wireshark.org/review/28109
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-06-08 11:22:39 +00:00
Jeff Morriss ba3dfd5f4b Fix rpm-setup.sh so it works when you're not installing the optional pkgs.
Looks like this has been broken since Ie46d56aff91694a3b8c4c62b4b03e38d3fb1e68a

Change-Id: Idd6cfc3e8d7f66160157eed393e8528ada7786d4
Reviewed-on: https://code.wireshark.org/review/28040
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-06-05 21:32:29 +00:00
Dario Lombardo 338604ad9e tools: rename rpm_setup.sh to reflect other similar scripts.
Change-Id: Ie686d7c5b808d9b89ff47cd65830ae441de8f8a2
Reviewed-on: https://code.wireshark.org/review/27862
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-05-29 04:20:07 +00:00