Fix up documentation of RPM packages.

Specify which ./configure options are passed into the RPM.

Describe the 3 package RPM package names and their contents.

Describe how to enable parallel builds when making RPMs.

RPM now stands for "RPM Package Manager."

Fix some markup problems.

Change-Id: I1664aa0956719e872d302a4af2c092318f5eea6d
Reviewed-on: https://code.wireshark.org/review/11737
Reviewed-by: Anders Broman <a.broman58@gmail.com>

3 files changed, 43 insertions, 12 deletions

diff --git a/docbook/wsdg_src/WSDG_chapter_env_intro.asciidoc b/docbook/wsdg_src/WSDG_chapter_env_intro.asciidoc
index 177985a6f3..a5518bd5b6 100644
--- a/docbook/wsdg_src/WSDG_chapter_env_intro.asciidoc
+++ b/docbook/wsdg_src/WSDG_chapter_env_intro.asciidoc
@@ -220,7 +220,7 @@ for the following systems:
   obtains a .deb file from which the package manager checks the dependencies and
   installs the software.
 
-* Red Hat (.rpm file). A user of a Red Hat Package Manager (RPM) based system
+* Red Hat (.rpm file). A user of a RPM Package Manager (RPM) based system
   obtains an .rpm file from which the package manager checks the dependencies
   and installs the software.
 
diff --git a/docbook/wsdg_src/WSDG_chapter_sources.asciidoc b/docbook/wsdg_src/WSDG_chapter_sources.asciidoc
index 5f92e0e03b..a965180f2d 100644
--- a/docbook/wsdg_src/WSDG_chapter_sources.asciidoc
+++ b/docbook/wsdg_src/WSDG_chapter_sources.asciidoc
@@ -867,7 +867,7 @@ You might get one of the following responses to your patch request:
   the core developers are busy (e.g., with their day jobs or family or other commitments) and
   haven't had time to look at your patch. Don't worry, if
   your patch is in the review system it won't get lost.
-+
+
 If you're concerned, feel free to add a comment to the patch or send an email
 to the developer's list asking for status. But please be patient: most if not
 all of us do this in our spare time.
@@ -1054,9 +1054,9 @@ to build the Debian Package.
 ==== Red Hat: .rpm packages
 
 The RPM is built using rpmbuild (http://www.rpm.org/), which comes as standard on many flavours of Linux, including
-Red Hat and Fedora. The process creates a clean build environment in _packaging/rpm/BUILD_every
+Red Hat and Fedora. The process creates a clean build environment in _packaging/rpm/BUILD_ every
 time the RPM is built. The settings controlling the build are in _packaging/rpm/SPECS/wireshark.spec.in_.
-After editing the settings in this file, _./configure_must be run again in the wireshark directory to
+After editing the settings in this file, _./configure_ must be run again in the wireshark directory to
 generate the actual specification script.
 
 
@@ -1064,9 +1064,14 @@ generate the actual specification script.
 [NOTE]
 ====
 The SPEC file contains settings for the _configure_ used to set the RPM build
-environment. These are completely independent of any settings passed to the
-usual Wireshark `./configure`. The exception to this rule is that the _prefix_
-given to `configure --prefix` is passed to rpmbuild.
+environment. These are mostly independent of any settings passed to the
+usual Wireshark `./configure`. The exceptions to this rule are:
+
+* The _prefix_ given to `configure --prefix` is passed to rpmbuild.
+
+* The selection of the GUI (Qt, Gtk+, or both) is passed to rpmbuild.
+
+* The selection of whether to include Lua support is passed to rpmbuild.
 ====
 
 In the wireshark directory, type:
@@ -1081,7 +1086,12 @@ to build the RPM and source RPM. Once it is done, there will be a message statin
 [TIP]
 ====
 Because this does a clean build as well as constructing the package this can
-take quite a long time.
+take quite a long time.  Suggestion: add the following to your `~/.rpmmacros`
+file to allow parallel builds:
+
+----
+%_smp_mflags -j %(grep -c processor /proc/cpuinfo)
+----
 ====
 
 .Build requirements differ from run requirements
diff --git a/docbook/wsug_src/WSUG_chapter_build_install.asciidoc b/docbook/wsug_src/WSUG_chapter_build_install.asciidoc
index a799d420a7..b7fd4620ff 100644
--- a/docbook/wsug_src/WSUG_chapter_build_install.asciidoc
+++ b/docbook/wsug_src/WSUG_chapter_build_install.asciidoc
@@ -318,15 +318,36 @@ the installation methods used with your version of UNIX. For example, under AIX,
 you would use _smit_ to install the Wireshark binary package, while under Tru64
 UNIX (formerly Digital UNIX) you would use _setld_. 
 
-==== Installing from rpm's under Red Hat and alike
+==== Installing from RPM's under Red Hat and alike
 
-Use the following command to install the Wireshark RPM that you have downloaded from the Wireshark web site: 
+Building RPMs from Wireshark's source code results in several packages (most
+distributions follow the same system):
+
+* The `wireshark` package contains the core Wireshark libraries and command-line
+  tools.
+
+* The `wireshark-qt` package contains the Qt-based GUI.
+
+* The `wireshark-gtk` (formerly `wireshark-gnome`) package contains the legacy
+Gtk+ based GUI.
+
+Many distributions use `yum` or a similar package management tool to make
+installation of software (including its dependencies) easier.  If your
+distribution uses `yum`, use the following command to install Wireshark
+together with the Qt GUI:
+
+----
+yum install wireshark wireshark-qt
+----
+
+If you've built your own RPMs from the Wireshark sources you can install them
+by running, for example:
 
 ----
-rpm -ivh wireshark-2.0.5.i386.rpm  
+rpm -ivh wireshark-2.0.0-1.x86_64.rpm wireshark-qt-2.0.0-1.x86_64.rpm
 ----
 
-If the above step fails because of missing dependencies, install the
+If the above command fails because of missing dependencies, install the
 dependencies first, and then retry the step above. 
 
 ==== Installing from deb's under Debian, Ubuntu and other Debian derivatives