rpm-guide rpm-guide-advanced-packaging-en.xml, 1.4, 1.5 rpm-guide-creating-rpms-en.xml, 1.4, 1.5 rpm-guide-intro-packaging-en.xml, 1.4, 1.5 rpm-guide-other-os-en.xml, 1.4, 1.5 rpm-guide-package-structure-en.xml, 1.2, 1.3 rpm-guide-programming-c-en.xml, 1.4, 1.5 rpm-guide-rpmbuild-en.xml, 1.4, 1.5 rpm-guide-specfile-syntax-en.xml, 1.3, 1.4 rpm-guide-specfiles-en.xml, 1.4, 1.5 rpm-guide-transactions-en.xml, 1.4, 1.5 rpm-guide-using-rpm-en.xml, 1.4, 1.5
Stuart Ellis (elliss)
fedora-docs-commits at redhat.com
Mon Nov 14 21:55:13 UTC 2005
Author: elliss
Update of /cvs/docs/rpm-guide
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11082
Modified Files:
rpm-guide-advanced-packaging-en.xml
rpm-guide-creating-rpms-en.xml
rpm-guide-intro-packaging-en.xml rpm-guide-other-os-en.xml
rpm-guide-package-structure-en.xml
rpm-guide-programming-c-en.xml rpm-guide-rpmbuild-en.xml
rpm-guide-specfile-syntax-en.xml rpm-guide-specfiles-en.xml
rpm-guide-transactions-en.xml rpm-guide-using-rpm-en.xml
Log Message:
Completed replacement of "Chapter X" with links
Index: rpm-guide-advanced-packaging-en.xml
===================================================================
RCS file: /cvs/docs/rpm-guide/rpm-guide-advanced-packaging-en.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- rpm-guide-advanced-packaging-en.xml 10 Nov 2005 22:30:06 -0000 1.4
+++ rpm-guide-advanced-packaging-en.xml 14 Nov 2005 21:55:05 -0000 1.5
@@ -1356,9 +1356,7 @@
Cross Reference
</para>
<para>
- See <xref linkend="ch-customizing-rpm"/> for more on macro file locations, and Chapters 19
- and 20 for more on using RPM on other versions of Linux and other
- operating systems, respectively.
+ See <xref linkend="ch-customizing-rpm"/> for more on macro file locations, and <xref linkend="ch-other-linuxes"/> and <xref linkend="ch-other-os"/> for more on using RPM on other versions of Linux and other operating systems, respectively.
</para>
<para>
RPM supports a number of ways to make parts of your spec file
Index: rpm-guide-creating-rpms-en.xml
===================================================================
RCS file: /cvs/docs/rpm-guide/rpm-guide-creating-rpms-en.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- rpm-guide-creating-rpms-en.xml 10 Nov 2005 22:30:06 -0000 1.4
+++ rpm-guide-creating-rpms-en.xml 14 Nov 2005 21:55:05 -0000 1.5
@@ -1095,7 +1095,7 @@
This example skips the install and uninstall script sections,
as well as a verification section. There are also no triggers
defined in this RPM spec file. All of these topics are covered
- in Chapters 10 and 11.
+ in <xref linkend="ch-specfiles"/> and <xref linkend="ch-advanced-packaging"/>.
</para>
<para>
Once you have written your spec file, and placed the files in
@@ -1552,8 +1552,7 @@
<sect1>
<title>Verifying Your RPMS</title>
<para>
- After you've built an RPM, you can use the techniques from Chapter
- 5 to verify the RPM. You can also use the –bl option to the
+ After you've built an RPM, you can use the techniques from <xref linkend="ch-using-rpm-db"/> to verify the RPM. You can also use the –bl option to the
rpmbuild command to verify the list of files in the RPM. Use a
command like the following:
</para>
Index: rpm-guide-intro-packaging-en.xml
===================================================================
RCS file: /cvs/docs/rpm-guide/rpm-guide-intro-packaging-en.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- rpm-guide-intro-packaging-en.xml 31 Oct 2005 23:18:20 -0000 1.4
+++ rpm-guide-intro-packaging-en.xml 14 Nov 2005 21:55:05 -0000 1.5
@@ -402,7 +402,7 @@
<title>Change of Name</title>
<!-- SE: Don't replace "&RH;" with an entity here: we don't want the text to change -->
<para>
- RPM was originally called &RH; Package Manager. After
+ RPM was originally called Red Hat Package Manager. After
adoption by other Linux distributions, the name has changed to
simply the RPM Package Manager. The RPM initials remain the
same.
@@ -411,11 +411,11 @@
<para>
As the original name implies, RPM was developed by &FORMAL-RHI;,
the major Linux distributor in the United States. Even though the
- original name seems to point to a &RH;-only solution, most Linux
+ original name seems to point to a Red Hat-only solution, most Linux
distributions use the RPM software. The RPM software provides a
foundation needed by Linux system administrators throughout the
world. You can even use RPM on other operating systems, both Linux
- and non-Linux, as covered in Chapters 19 and 20, respectively.
+ and non-Linux, as covered in <xref linkend="ch-other-linuxes"/> and <xref linkend="ch-other-os"/>, respectively.
</para>
<para>
The RPM system provides all of the features needed to manage
Index: rpm-guide-other-os-en.xml
===================================================================
RCS file: /cvs/docs/rpm-guide/rpm-guide-other-os-en.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- rpm-guide-other-os-en.xml 10 Nov 2005 22:30:07 -0000 1.4
+++ rpm-guide-other-os-en.xml 14 Nov 2005 21:55:05 -0000 1.5
@@ -1234,8 +1234,7 @@
Cross Reference
</para>
<para>
- <xref linkend="ch-creating-rpms"/> covers how to run the rpmbuild command, and Chapter
- 10 covers spec files in detail.
+ <xref linkend="ch-creating-rpms"/> covers how to run the rpmbuild command, and <xref linkend="ch-specfiles"/> covers spec files in detail.
</para>
</sect3>
<sect3>
Index: rpm-guide-package-structure-en.xml
===================================================================
RCS file: /cvs/docs/rpm-guide/rpm-guide-package-structure-en.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- rpm-guide-package-structure-en.xml 26 Oct 2005 01:54:11 -0000 1.2
+++ rpm-guide-package-structure-en.xml 14 Nov 2005 21:55:05 -0000 1.3
@@ -34,8 +34,7 @@
Cross Reference
</para>
<para>
- Chapters 16, 17, and 18 cover programming with C, Python, and Perl,
- respectively.
+ <xref linkend="ch-programming-c"/>, <xref linkend="ch-rpm-programming-python"/>, and <xref linkend="ch-programming-perl"/> cover programming with C, Python, and Perl, respectively.
</para>
<para>
The RPM package format described here has been standardized as part
Index: rpm-guide-programming-c-en.xml
===================================================================
RCS file: /cvs/docs/rpm-guide/rpm-guide-programming-c-en.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- rpm-guide-programming-c-en.xml 10 Nov 2005 22:30:07 -0000 1.4
+++ rpm-guide-programming-c-en.xml 14 Nov 2005 21:55:05 -0000 1.5
@@ -2176,8 +2176,7 @@
</para>
<para>
All in all, the popt library provides a handy library for
- processing command-line options and aliases, covered in Chapter
- 21.
+ processing command-line options and aliases, covered in <xref linkend="ch-customizing-rpm"/>.
</para>
</sect2>
<sect2>
Index: rpm-guide-rpmbuild-en.xml
===================================================================
RCS file: /cvs/docs/rpm-guide/rpm-guide-rpmbuild-en.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- rpm-guide-rpmbuild-en.xml 10 Nov 2005 22:30:07 -0000 1.4
+++ rpm-guide-rpmbuild-en.xml 14 Nov 2005 21:55:05 -0000 1.5
@@ -45,8 +45,7 @@
<title>Building RPMs with the rpmbuild Command</title>
<para>
The rpmbuild command provides a workhorse command for building
- RPMs in all sorts of ways. The basic syntax, as shown in Chapter
- 9, is:
+ RPMs in all sorts of ways. The basic syntax, as shown in <xref linkend="ch-creating-rpms"/>, is:
</para>
<para>
rpmbuild -bBuildStage spec_file
Index: rpm-guide-specfile-syntax-en.xml
===================================================================
RCS file: /cvs/docs/rpm-guide/rpm-guide-specfile-syntax-en.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- rpm-guide-specfile-syntax-en.xml 10 Nov 2005 22:30:07 -0000 1.3
+++ rpm-guide-specfile-syntax-en.xml 14 Nov 2005 21:55:05 -0000 1.4
@@ -662,7 +662,7 @@
<title>Build Sections</title>
<para>
After providing information about the package, you need to define
- the build stages, as described in Chapters 10 and 12.
+ the build stages, as described in <xref linkend="ch-specfiles"/> and <xref linkend="ch-rpmbuild"/>.
</para>
<sect2>
<title>Build preparation</title>
Index: rpm-guide-specfiles-en.xml
===================================================================
RCS file: /cvs/docs/rpm-guide/rpm-guide-specfiles-en.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- rpm-guide-specfiles-en.xml 10 Nov 2005 22:30:07 -0000 1.4
+++ rpm-guide-specfiles-en.xml 14 Nov 2005 21:55:05 -0000 1.5
@@ -196,9 +196,10 @@
<sect2>
<title>Storing spec files on disk</title>
<para>
- As discussed in <xref linkend="ch-creating-rpms"/> , the rpmbuild command expands source
- RPMs to the /usr/src/redhat directory. Under this directory, the
- RPM system assumes five subdirectories, listed in Table 10-1.
+ As discussed in <xref linkend="ch-creating-rpms"/> , the
+ rpmbuild command expands source RPMs to the /usr/src/redhat
+ directory. Under this directory, the RPM system assumes five
+ subdirectories, listed in Table 10-1.
</para>
<para>
Table 10-1 Default RPM directories
@@ -291,11 +292,13 @@
Cross Reference
</para>
<para>
- These directories are the default directories. See <xref linkend="ch-specfile-syntax"/>
- for changing RPM default values. In addition, these are the
- defaults for &RHL;. See Chapters 19 and 20 for
- discussions on other versions of Linux and other non-Linux
- operating systems, respectively.
+ These directories are the default directories. See
+ <xref linkend="ch-specfile-syntax"/> for changing RPM default
+ values. In addition, these are the defaults for &RHL;. See
+ <xref linkend="ch-other-linuxes"/> and
+ <xref linkend="ch-other-linuxes"/> for discussions on other
+ versions of Linux and other non-Linux operating systems,
+ respectively.
</para>
<para>
With the knowledge of the spec file syntax covered in the
@@ -432,15 +435,15 @@
<para>
Many graphical installation tools divide packages by these
categories, so you want to fit into the existing group names
- if possible. (See <xref linkend="ch-using-rpm-db"/> for more on querying group
- information from RPMs.) The official list of groups are
- located in the file /usr/share/doc/rpm-4.1/GROUPS for RPM 4.1,
- and in a similar location for other RPM versions.
+ if possible. (See <xref linkend="ch-using-rpm-db"/> for more
+ on querying group information from RPMs.) The official list of
+ groups are located in the file /usr/share/doc/rpm-4.1/GROUPS
+ for RPM 4.1, and in a similar location for other RPM versions.
</para>
<para>
The Distribution: directive is used by Linux distribution
- vendors such as &RH; to identify that the package is part
- of a given distribution, or was built for a particular
+ vendors such as &RH; to identify that the package is part of a
+ given distribution, or was built for a particular
distribution. Most packages created outside of the Linux
vendors don’t provide this directive.
</para>
@@ -615,8 +618,9 @@
Cross Reference
</para>
<para>
- Chapters 19 and 20 cover RPMs on other versions of Linux and
- other operating systems, respectively.
+ <xref linkend="ch-other-linuxes"/> and
+ <xref linkend="ch-other-os"/> cover RPMs on other versions of
+ Linux and other operating systems, respectively.
</para>
</sect3>
</sect2>
@@ -822,8 +826,9 @@
Cross Reference
</para>
<para>
- <xref linkend="ch-packaging-guidelines"/> discusses packaging guidelines and best practices.
- Starting from pristine sources is one of the best practices.
+ <xref linkend="ch-packaging-guidelines"/> discusses packaging
+ guidelines and best practices. Starting from pristine sources is
+ one of the best practices.
</para>
<para>
Similar to the sources directives, you can define a Nopatch:
@@ -849,7 +854,8 @@
Cross Reference
</para>
<para>
- <xref linkend="ch-creating-rpms"/> covers make and other Linux build tools.
+ <xref linkend="ch-creating-rpms"/> covers make and other Linux
+ build tools.
</para>
<para>
In RPM terms, building the package is split into four steps:
@@ -1215,8 +1221,8 @@
</para>
<para>
If you intend to support relocatable packages, covered in
- <xref linkend="ch-advanced-packaging"/> , you will likely need to pass a --prefix option to
- the configure script. For example:
+ <xref linkend="ch-advanced-packaging"/> , you will likely need
+ to pass a --prefix option to the configure script. For example:
</para>
<para>
%build
@@ -1370,8 +1376,9 @@
Cross Reference
</para>
<para>
- <xref linkend="ch-advanced-packaging"/> covers triggers, another form of script that gets run
- when packages are installed or removed.
+ <xref linkend="ch-advanced-packaging"/> covers triggers, another
+ form of script that gets run when packages are installed or
+ removed.
</para>
<para>
Start your scripts with the RPM section marker for the given
@@ -1879,7 +1886,8 @@
Cross Reference
</para>
<para>
- See <xref linkend="ch-using-rpm-db"/> for more on package verification.
+ See <xref linkend="ch-using-rpm-db"/> for more on package
+ verification.
</para>
<para>
The %verify directive names the tests to include or not include.
@@ -2110,8 +2118,8 @@
</para>
<para>
You can also store this setting in a macro file so that it
- applies for all packages you build. See <xref linkend="ch-customizing-rpm"/> for more on
- macro files.
+ applies for all packages you build. See
+ <xref linkend="ch-customizing-rpm"/> for more on macro files.
</para>
<para>
While the Fascist build policy may be an annoyance, it can prove
@@ -2475,7 +2483,7 @@
Cross Reference
</para>
<para>
- <xref linkend="ch-scripting"/> covers shell scripting with RPM.
+ <xref linkend="ch-scripting"/> covers shell scripting with RPM.
</para>
<para>
With parameters, you can expand the normal definition of a macro
Index: rpm-guide-transactions-en.xml
===================================================================
RCS file: /cvs/docs/rpm-guide/rpm-guide-transactions-en.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- rpm-guide-transactions-en.xml 10 Nov 2005 22:30:07 -0000 1.4
+++ rpm-guide-transactions-en.xml 14 Nov 2005 21:55:05 -0000 1.5
@@ -152,7 +152,8 @@
Cross Reference
</para>
<para>
- The gnorpm command is covered in <xref linkend="ch-management-software"/> . The rpmrebuild package
+ The gnorpm command is covered in
+ <xref linkend="ch-management-software"/> . The rpmrebuild package
is covered in the "Saving Old Packages" section in this chapter.
</para>
<para>
@@ -322,7 +323,8 @@
Cross Reference
</para>
<para>
- <xref linkend="ch-using-rpm-db"/> describes the --queryformat option.
+ <xref linkend="ch-using-rpm-db"/> describes the --queryformat
+ option.
</para>
<para>
There is also a transaction ID for removal, the REMOVETID. You
@@ -499,11 +501,11 @@
<para>
Because of all these limitations, rollbacks do not work in all
situations. In place of the --rollback option, you can use the
- query shortcuts introduced in <xref linkend="ch-using-rpm-db"/> and find the packages
- you have installed recently (if that is what you want to roll
- back). In this case, you can use the rpm command to remove the
- packages you want to get rid of and reinstall the packages you
- want to restore.
+ query shortcuts introduced in <xref linkend="ch-using-rpm-db"/>
+ and find the packages you have installed recently (if that is
+ what you want to roll back). In this case, you can use the rpm
+ command to remove the packages you want to get rid of and
+ reinstall the packages you want to restore.
</para>
<para>
In many cases, this manual approach is safest, and you will have
@@ -527,8 +529,9 @@
The package created by the --repackage option is not a complete
RPM package. You can use the rpmbuild command to make it into a
complete package, but by itself, it will not be a complete
- package. See Chapters 10, 11, and 12 for more on building
- packages.
+ package. See <xref linkend="ch-specfiles"/>,
+ <xref linkend="ch-advanced-packaging"/>, and
+ <xref linkend="ch-rpmbuild"/> for more on building packages.
</para>
<para/>
<para>
@@ -547,8 +550,8 @@
Note
</para>
<para>
- The up2date name comes from the &RH; service for keeping a
- system up to date with regard to package versions.
+ The up2date name comes from the &RH; service for keeping a system
+ up to date with regard to package versions.
</para>
<para>
For example, say you have a package, jikes (a Java programming
Index: rpm-guide-using-rpm-en.xml
===================================================================
RCS file: /cvs/docs/rpm-guide/rpm-guide-using-rpm-en.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- rpm-guide-using-rpm-en.xml 10 Nov 2005 22:30:07 -0000 1.4
+++ rpm-guide-using-rpm-en.xml 14 Nov 2005 21:55:05 -0000 1.5
@@ -79,7 +79,9 @@
Cross Reference
</para>
<para>
- Chapters 9 and 12 cover building RPMs from source RPMs.
+ <xref linkend="ch-creating-rpms"/> and
+ <xref linkend="ch-rpmbuild"/> cover building RPMs from source
+ RPMs.
</para>
<para>
The rpm command provides three main operations for upgrading and
@@ -111,8 +113,8 @@
<para/>
<para>
Almost all installation steps use the rpm command with the –U
- option, short for upgrade, as introduced in <xref linkend="ch-rpm-overview"/> . The basic
- syntax is:
+ option, short for upgrade, as introduced in
+ <xref linkend="ch-rpm-overview"/> . The basic syntax is:
</para>
<para>
rpm -U package_name
@@ -144,9 +146,9 @@
</para>
<para>
This warning comes from the fact that the package was signed,
- but the key was not found. <xref linkend="ch-rpmbuild"/> covers signing packages.
- In most cases, warnings such as this one are not that serious.
- Errors, though, should be treated seriously.
+ but the key was not found. <xref linkend="ch-rpmbuild"/> covers
+ signing packages. In most cases, warnings such as this one are
+ not that serious. Errors, though, should be treated seriously.
</para>
<para>
Note
@@ -971,12 +973,11 @@
</para>
<para>
Note that when you purchase an upgraded version of Linux, such
- as &RHL;, all the packages with the product should be
- properly aligned with each other as to versions. This
- alignment problem is an issue that the Linux vendors, such as
- &RH;, need to take care of. The main problems occur when
- you need packages beyond those offered with your Linux
- distribution.
+ as &RHL;, all the packages with the product should be properly
+ aligned with each other as to versions. This alignment problem
+ is an issue that the Linux vendors, such as &RH;, need to take
+ care of. The main problems occur when you need packages beyond
+ those offered with your Linux distribution.
</para>
<para>
To combine some of these options, you can use --force, which
@@ -1037,11 +1038,11 @@
</para>
<para>
The --aid option depends on a separate package that contains
- an RPM database with all packages installed. For &RH;
- Linux, this package is rpmdb-redhat. This separate database,
- built as if all packages were installed (all packages that
- come with &RHL; in this case), allows the rpm command
- to search for which packages would solve dependencies.
+ an RPM database with all packages installed. For &RH; Linux,
+ this package is rpmdb-redhat. This separate database, built as
+ if all packages were installed (all packages that come with
+ &RHL; in this case), allows the rpm command to search for
+ which packages would solve dependencies.
</para>
</sect3>
<sect3>
@@ -1174,8 +1175,8 @@
</para>
<para>
In addition to pre- and post-installation scripts, the RPM
- system supports triggers, a topic covered in detail in Chapter
- 11.
+ system supports triggers, a topic covered in detail in
+ <xref linkend="ch-advanced-packaging"/>.
</para>
<para>
During installation, you can tell the rpm command not to
@@ -1454,8 +1455,8 @@
configuration file on disk. This is where the rpm command
starts working with some upgrade rules. Note that this special
processing only applies to files marked as configuration files
- within the RPM. <xref linkend="ch-specfiles"/> covers how to mark files as
- configuration files.
+ within the RPM. <xref linkend="ch-specfiles"/> covers how to
+ mark files as configuration files.
</para>
<para>
If the file on disk is identical to the file in the original
@@ -1689,9 +1690,9 @@
example, rarely come with source code. In this case, obviously,
no source RPMs are available. Or, a source RPM for a commercial
application may provide no source code, but still provide a way
- to build the resulting application. See <xref linkend="ch-specfiles"/> for more on
- the source files and options for not including the sources in a
- source RPM.
+ to build the resulting application. See
+ <xref linkend="ch-specfiles"/> for more on the source files and
+ options for not including the sources in a source RPM.
</para>
<para>
Open-source Software
@@ -1992,7 +1993,8 @@
Cross Reference
</para>
<para>
- See <xref linkend="ch-customizing-rpm"/> for more on the --showrc option.
+ See <xref linkend="ch-customizing-rpm"/> for more on the --showrc
+ option.
</para>
<para>
The --version option tells the rpm command to print out the
More information about the Fedora-docs-commits
mailing list