diff options
| author | Jeff Morriss <jeff.morriss.ws@gmail.com> | 2016-05-09 13:51:26 -0400 |
|---|---|---|
| committer | Jeff Morriss <jeff.morriss.ws@gmail.com> | 2016-05-12 01:36:14 +0000 |
| commit | 790dab15681ed75f21f470be693aad831a6af768 (patch) | |
| tree | 12e8a178e2d64c791aec474b303738d1ba82e281 /packaging | |
| parent | bbfe0386866605c68e2b7af9338c97f5d8799f0b (diff) | |
RPM: make autoconf (and a few other build dependencies) optional.
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>
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/rpm/SPECS/wireshark.spec.in | 25 |
1 files changed, 21 insertions, 4 deletions
diff --git a/packaging/rpm/SPECS/wireshark.spec.in b/packaging/rpm/SPECS/wireshark.spec.in index 6f7282eeb8..256441ddc4 100644 --- a/packaging/rpm/SPECS/wireshark.spec.in +++ b/packaging/rpm/SPECS/wireshark.spec.in @@ -24,6 +24,12 @@ %global package_version @VERSION@ +# Set this variable to 1 if you have modified this file to patch Wireshark in +# such a way that automake needs to be re-run (e.g., you modified a Makefile.am +# or Makefile.common, for example to add a dissector). +# Setting this causes ./autogen.sh to be re-run (which runs automake, etc.). +%global run_automake 0 + Summary: Wireshark is the world's foremost protocol analyzer Name: wireshark @@ -41,15 +47,18 @@ Obsoletes: wireshark-devel BuildRoot: /tmp/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: autoconf >= @AC_MIN_VERSION@ -BuildRequires: automake BuildRequires: libtool BuildRequires: gcc -BuildRequires: flex -BuildRequires: bison BuildRequires: python BuildRequires: perl +%if %{run_automake} +BuildRequires: autoconf >= @AC_MIN_VERSION@ +BuildRequires: automake +BuildRequires: flex +BuildRequires: bison +%endif + BuildRequires: glib2-devel >= @GLIB_MIN_VERSION@ Requires: glib2 >= @GLIB_MIN_VERSION@ BuildRequires: libpcap-devel @@ -218,6 +227,10 @@ This package contains the GTK+ Wireshark GUI and desktop integration files. %prep %setup -q -n %{name}-%{package_version} +%if %{run_automake} +./autogen.sh +%endif + # Don't specify the prefix here: configure is a macro which expands to set # the prefix and everything else too. If you need to change the prefix # set _prefix (note the underscore) either in this file or on rpmbuild's @@ -426,6 +439,10 @@ fi %endif %changelog +* Mon May 9 2016 Jeff Morriss +- Make autoconf, automake, flex, and bison optional: most users (who aren't + patching Wireshark) don't need them to build an RPM. + * Tue Nov 10 2015 Jeff Morriss - Rename the gnome package to gtk: Wireshark uses Gtk+ but isn't part of GNOME. |