From b8861933094ddd6ec9d366648186efab8a1ab0cb Mon Sep 17 00:00:00 2001
From: Gerald Combs <gerald@wireshark.org>
Date: Wed, 11 Apr 2018 09:57:36 +0800
Subject: RPM: Make documentation installation optional.

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>
---
 packaging/rpm/wireshark.spec.in | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/packaging/rpm/wireshark.spec.in b/packaging/rpm/wireshark.spec.in
index 455a94ab1a..c302877164 100644
--- a/packaging/rpm/wireshark.spec.in
+++ b/packaging/rpm/wireshark.spec.in
@@ -15,10 +15,11 @@
 %bcond_with	ninja
 %bcond_with	lz4_and_snappy
 %bcond_with	c_ares
-%bcond_without spandsp
-%bcond_without bcg729
-%bcond_with	 libxml2
+%bcond_without	spandsp
+%bcond_without	bcg729
+%bcond_with	libxml2
 %bcond_with	nghttp2
+%bcond_with	guides
 
 # To do: Add bcond_with clang
 
@@ -57,8 +58,10 @@ BuildRequires:	python
 BuildRequires:	perl
 BuildRequires:	flex
 BuildRequires:	bison
+%if %{with guides}
 # HTML guides
 BuildRequires:	asciidoctor
+%endif
 
 BuildRequires:	glib2-devel >= @GLIB2_MIN_VERSION@
 Requires:	glib2 >= @GLIB2_MIN_VERSION@
@@ -261,6 +264,8 @@ Requires:	libmaxminddb
   .
 
 %if %{with ninja}
+# Older RPM-based distributions used ninja-build in order to prevent a collision with
+# the Ninja IRC client: https://bugzilla.redhat.com/show_bug.cgi?id=1166135
 NINJA=$(which ninja || which ninja-build)
 %endif
 
@@ -276,11 +281,15 @@ make %{?_smp_mflags}
 rm -rf $RPM_BUILD_ROOT
 %if %{with ninja}
 DESTDIR=$RPM_BUILD_ROOT $NINJA install
+%if %{with guides}
 DESTDIR=$RPM_BUILD_ROOT $NINJA install_guides
+%endif
 %else
 make DESTDIR=$RPM_BUILD_ROOT install
+%if %{with guides}
 make DESTDIR=$RPM_BUILD_ROOT install_guides
 %endif
+%endif
 
 # If we're being installed in an unusual prefix tell the loader where
 # to find our libraries.
@@ -330,6 +339,7 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 %defattr(-,root,root)
 %doc AUTHORS COPYING ChangeLog INSTALL NEWS README*
 
+%if %{with guides}
 # Include the User Guide:
 %if %{with ninja}
 %docdir %{_datadir}/doc/Wireshark/
@@ -339,6 +349,7 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 %{_datadir}/doc/wireshark/guides/
 %else
 %endif
+%endif
 
 # Don't pick up any of the wireshark (GUI) binaries here
 %exclude %{_bindir}/wireshark*
@@ -397,6 +408,9 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 %endif
 
 %changelog
+* Wed Apr 11 2018 Gerald Combs
+- Make documentation installation conditional.
+
 * Tue Mar 20 2018 Gerald Combs
 - Migrate from Autotools to CMake.
 - Remove Qt4, GTK+ 2, and GTK+ 3 sections.
-- 
cgit v1.2.3