From a8b9531d9581759773023c1e127ea9514bc91852 Mon Sep 17 00:00:00 2001
From: Petr Kovar <pkovar@redhat.com>
Date: Nov 10 2011 11:58:53 +0000
Subject: Procedure fixes


---

diff --git a/en-US/Creating_and_Building_RPM_Packages.xml b/en-US/Creating_and_Building_RPM_Packages.xml
index 26aeccb..ddb17cc 100644
--- a/en-US/Creating_and_Building_RPM_Packages.xml
+++ b/en-US/Creating_and_Building_RPM_Packages.xml
@@ -44,7 +44,7 @@
 			<step><para>As root, install the <package>rpmdevtools</package> package with the following command:</para>
 			<screen><command>yum install -y rpmdevtools</command></screen>
 			</step>
-			<step><para>As a normal user, run the following command to create a <filename>~/rpmbuild/</filename> directory where packages are built. This command also creates the <filename>~/.rpmmacros</filename> file and add vital options to the file:</para>
+			<step><para>As a normal user, run the following command to create a <filename>~/rpmbuild/</filename> directory where packages are built:<!--This command also creates the <filename>~/.rpmmacros</filename> file and add vital options to the file:--></para>
 			<screen><command>rpmdev-setuptree</command></screen>
                         </step>
 			<!--step><para>Open the <filename>~/.rpmmacros</filename> file in a text editor. An example of the <filename>~/.rpmmacros</filename> file is below:</para>
@@ -471,25 +471,29 @@ make install DESTDIR=$RPM_BUILD_ROOT
 If you end up with an error message similar to the following one, it means that you have not installed the package dependencies required by the <package>eject</package> package:</para>
 <screen><code>error: Failed build dependencies:
 libtool >= 2.0.0 is needed by eject-2.1.5-0.1.x86_64</code></screen>
-         <para>You can use <package>yum</package> to install the needed files or packages. In this case, run the following command to install the required <package>libtool</package> package:
+         <substeps><step><para>You can use <package>yum</package> to install the needed files or packages. In this case, run the following command to install the required <package>libtool</package> package:</para>
          <screen><command>yum install -y libtool</command></screen>
-</para>
-
+</step>
+<step><para>Alternatively, you can install the needed dependencies all at once by using the <command>yum-builddep</command> command. Point <command>yum-builddep</command> to the source package <package>eject-2.1.5-0.1.&PKGOS;.src.rpm</package>, which is located in the <filename>~/rpmbuild/SRPMS/</filename> directory:</para>
+<screen><command>yum-builddep eject-2.1.5-0.1.&PKGOS;.src.rpm</command></screen>
+</step>
+</substeps>
 </step>
 <step><para>In case you have received a build error related to the <code>%install</code> section, you may want to skip earlier stages of the build process with the <option> --short-circuit</option> option and restart the build at the <code>%install</code> stage:</para>
 <screen><command>rpmbuild -bi --short-circuit eject.spec</command></screen>
 </step>
 <step>
 <para>Once you get a clean build, the last line of the <command>rpmbuild</command> output will as follows:</para>
-<screen>+ exit 0</screen>
-<para>After a successful build with the <command>rpmbuild -ba eject.spec</command> command, the binary package will be placed in a subdirectory of the <filename>~/rpmbuild/RPMS/</filename> directory and the source package will be placed in <filename>~/rpmbuild/SRPMS</filename>.</para>
+<screen>+ exit 0</screen></step>
+<step>
+<para>After a successful build with the <command>rpmbuild -ba eject.spec</command> command, the binary package will be placed in a subdirectory of the <filename>~/rpmbuild/RPMS/</filename> directory and the source package will be placed in <filename>~/rpmbuild/SRPMS/</filename>.</para>
 </step>
 <step><para>
 If you just want to create a source package (<filename>.src.rpm</filename>), run the following command:</para>
 <screen><command>rpmbuild -bs eject.spec
 </command></screen>
 <para>
-This will create the source package in the <filename>~/rpmbuild/SRPMS</filename> directory.</para>
+This will create the source package in the <filename>~/rpmbuild/SRPMS/</filename> directory, or recreate it if it has been previously created.</para>
 </step>
    </procedure> 
 </task>