Update rpm-faq manual page.

diff --git a/docs/manual/rpm-faq.tex b/docs/manual/rpm-faq.tex
index abb241be308dc90e10da09d8b4fcf0f629e55d0b..d95bb8123603ef1079cf39901ce35b29589774bf 100644 (file)
--- a/docs/manual/rpm-faq.tex
+++ b/docs/manual/rpm-faq.tex
@@ -36,13 +36,14 @@ Packaging FAQ}
    {\bf How do I build Bacula for platform xxx?}
    The bacula spec file contains defines to build for several platforms:
    RedHat 7.x (rh7), RedHat 8.0 (rh8), RedHat 9 (rh9), Fedora Core (fc1,
-   fc3, fc4), Whitebox Enterprise Linux (RHEL) 3.0 (wb3), Mandrake 10.x
-   (mdk) and SuSE 9.x (su9).  The package build is controlled by a
-   mandatory define set at the beginning of the file.  These defines
-   basically just control the dependency information that gets coded into
-   the finished rpm package.  The platform define may be edited in the spec
-   file directly (by default all defines are set to 0 or "not set").  For
-   example, to build the RedHat 7.x package find the line in the spec file
+   fc3, fc4), Whitebox Enterprise Linux 3.0 (wb3), Red Hat Enterprise Linux 
+   (rhel3, rhel4), Mandrake 10.x (mdk), CentOS (centos3, centos4) and SuSE 
+   (su9, su10). The package build is controlled by a mandatory define set at 
+   the beginning of the file.  These defines basically just control the 
+   dependency information that gets coded into the finished rpm package as well 
+   as any special configure options required.  The platform define may be edited 
+   in the spec file directly (by default all defines are set to 0 or "not set").  
+   For example, to build the RedHat 7.x package find the line in the spec file
    which reads
 
 \footnotesize
@@ -82,6 +83,8 @@ Alternately you may pass the define on the command line when calling rpmbuild:
 \footnotesize
 \begin{verbatim}
         %define mysql 0
+        OR
+        %define mysql4 0
         
 \end{verbatim}
 \normalsize
@@ -91,6 +94,8 @@ to
 \footnotesize
 \begin{verbatim}
         %define mysql 1
+        OR
+        %define mysql4 1
         
 \end{verbatim}
 \normalsize
@@ -100,6 +105,7 @@ in the spec file directly or pass it to rpmbuild on the command line:
 \footnotesize
 \begin{verbatim}
         rpmbuild -ba --define "build_rh7 1" --define "build_mysql 1" bacula.spec
+        rpmbuild -ba --define "build_rh7 1" --define "build_mysql4 1" bacula.spec
         
 \end{verbatim}
 \normalsize
@@ -107,7 +113,7 @@ in the spec file directly or pass it to rpmbuild on the command line:
 \item 
    \label{faq3}
    {\bf What other defines are used?}
-   Two other building defines of note are the depkgs\_version and tomsrtbt
+   Two other building defines of note are the depkgs\_version and \_rescuever
    identifiers. These  two defines are set with each release and must match the
    version of those sources that are  being used to build the packages. You would
    not ordinarily need to edit these.  
@@ -120,18 +126,20 @@ in the spec file directly or pass it to rpmbuild on the command line:
    be built by a regular user but you must make a few changes on your
    system to do this.  If you are building on your own system then the
    simplest method is to add write permissions for all to the build
-   directory (/usr/src/redhat/).  To accomplish this, execute the following
-   command as root:
+   directory (/usr/src/redhat/, /usr/src/RPM or /usr/src/packages).  
+   To accomplish this, execute the following command as root:
 
 \footnotesize
 \begin{verbatim}
         chmod -R 777 /usr/src/redhat
+        chmod -R 777 /usr/src/RPM
+        chmod -R 777 /usr/src/packages
         
 \end{verbatim}
 \normalsize
 
 If you are working on a shared system where you can not use the method
-above then you need to recreate the /usr/src/redhat directory tree with all
+above then you need to recreate the appropriate above directory tree with all
 of its subdirectories inside your home directory.  Then create a file named
 
 {\tt .rpmmacros} 
@@ -146,6 +154,17 @@ and add the following line:
 \end{verbatim}
 \normalsize
 
+Another handy directive for the .rpmmacros file if you wish to supress the
+creation of debug rpm packages is:
+
+\footnotesize
+\begin{verbatim}
+        %debug_package %{nil}
+        
+\end{verbatim}
+
+\normalsize
+
 \item 
    \label{faq5}
    {\bf I'm building my own rpms but on all platforms and compiles I get an
@@ -155,12 +174,14 @@ and add the following line:
    package.  One of the example scripts in this directory is a pagsh
    script.  Rpmbuild, when scanning for dependencies, looks at the shebang
    line of all packaged scripts in addition to checking shared libraries.
-   To avoid this do not package the examples directory.
+   To avoid this do not package the examples directory. If you are seeing this 
+   problem you are building a very old bacula package as the examples have been 
+   removed from the doc packaging.
 \end{enumerate}
 
-\item {\bf Support for RHEL4, CentOS 4 and x86_64}
-   The examples below
-   explicit build support for RHEL4 (I think) and CentOS 4. Build support 
+\item {\bf Support for RHEL3/4, CentOS 3/4 and x86_64}
+   The examples below show
+   explicit build support for RHEL4 and CentOS 4. Build support 
    for x86_64 has also been added. Test builds have been done on CentOS but 
    not RHEL4.
 
@@ -180,7 +201,6 @@ rpmbuild --rebuild \
 
 rpmbuild --rebuild \
         --define "build_rhel4 1" \
-        --define "build_mysql 1" \
         --define "build_mysql4 1" \
         bacula-1.38.3-1.src.rpm
 
@@ -214,19 +234,22 @@ The spec file currently supports building on the following platforms:
 --define "build_rhel4 1"
 
 # CentOS build
+--define "build_centos3 1"
 --define "build_centos4 1"
 
 # SuSE build
 --define "build_su9 1"
+--define "build_su10 1"
 
 # Mandrake build
 --define "build_mdk 1"
 
 MySQL support:
 
+# for mysql 3.23.x support define this
 --define "build_mysql 1"
-# if using mysql 4.x define this and mysql above
-# currently: Mandrake 10.x, SuSE 9.x, RHEL4
+# if using mysql 4.x define this
+# currently: Mandrake 10.x, SuSE 9.x & 10.x, FC4 & RHEL4
 --define "build_mysql4 1"
 
 PostgreSQL support: