Remove rollback and repackage from documentation

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 7d3d137..e0b72f6 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -48,7 +48,6 @@ manual/macros \
 manual/multiplebuilds \
 manual/queryformat \
 manual/relocatable \
-manual/rollbacks \
 manual/signatures \
 manual/spec \
 manual/triggers \

diff --git a/doc/ja/rpm.8 b/doc/ja/rpm.8
index 4bbc243..c6ffd32 100644 (file)
--- a/doc/ja/rpm.8
+++ b/doc/ja/rpm.8
@@ -68,7 +68,7 @@ rpm \- RPM パッケージマネージャ
 
 .BR rpm " {" \-e|\-\-erase "} [" \-\-allmatches "] [" \-\-nodeps "] [" \-\-noscripts ]
 .br
-.RB "    [" \-\-notriggers "] [" \-\-repackage "] [" \-\-test ]
+.RB "    [" \-\-notriggers "] [" \-\-test ]
 .I PACKAGE_NAME ...
 .SS その他:
 .BR rpm " {" \-\-initdb|\-\-rebuilddb }
@@ -162,7 +162,6 @@ rpm \- RPM パッケージマネージャ
 .RB [ \-\-prefix " " "\fINEWPATH" ]
 .br
 .RB [ \-\-relocate " " "\fIOLDPATH" = "\fINEWPATH" ]
-.RB [ \-\-repackage ] 
 .br
 .RB [ \-\-replacefiles ] 
 .RB [ \-\-replacepkgs ]
@@ -436,17 +435,6 @@ rpm をインストールするコマンドの一般的な形式は:
 が再配置されなければならないのなら、
 このオプションを繰り返し指定することができる。
 .TP
-.B \-\-repackage
-ファイルを削除する前に再パッケージする。
-以前にインストールされていたパッケージは、マクロ
-.B %_repackage_name_fmt
-によって名付けられ、マクロ
-.B %_repackage_dir
-(デフォルトは
-.IR /var/spool/repackage ;
-訳注: /usr/lib/rpm/macros では /var/spool/repackage に設定されている)
-で指定されたディレクトリに作成される。
-.TP
 .B \-\-replacefiles
 既にインストールされた他のパッケージのファイルを置き換えてしまう場合でも、
 パッケージをインストールする。
@@ -463,7 +451,7 @@ rpm を削除するコマンドの一般的な形式は:
 .PP
 .BR rpm " {" \-e|\-\-erase "} [" \-\-allmatches "] [" \-\-nodeps "] [" \-\-noscripts ]
 .br
-.RB "    [" \-\-notriggers "] [" \-\-repackage "] [" \-\-test ]
+.RB "    [" \-\-notriggers "] [" \-\-test ]
 .I "PACKAGE_NAME ..."
 .PP
 以下のオプションが使用できる:
@@ -514,17 +502,6 @@ rpm を削除するコマンドの一般的な形式は:
 .B %triggerpostun
 スクリプト(群)を実行しない。
 .TP
-.B \-\-repackage
-ファイルを削除する前に再パッケージする。
-以前にインストールされていたパッケージは、マクロ
-.B %_repackage_name_fmt
-によって名付けられ、マクロ
-.B %_repackage_dir
-(デフォルトは
-.IR /var/spool/repackage ;
-訳注: /usr/lib/rpm/macros では /var/spool/repackage に設定されている)
-で指定されたディレクトリに作成される。
-.TP
 .B \-\-test
 実際には何もアンインストールせず挙動だけを見せる。
 オプション

diff --git a/doc/manual/rollbacks b/doc/manual/rollbacks
deleted file mode 100644 (file)
index 0b075b8..0000000
--- a/doc/manual/rollbacks
+++ /dev/null
@@ -1,49 +0,0 @@
-The term "transaction rollback" is jargon for a method of maintaining
-sets of packages that are applied to boxen sequentially. In a nutshell,
-packages that are to be installed/removed are aggregated into something
-called a "transaction set". Each transaction set is then assigned a unique
-identifier so that the packages in the set can be distinguished, Finally,
-since the transaction set identifier (TID) can be ordered, transaction sets
-can be managed just like packages, since each TID will identify the sets
-of packages to be installed/removed at each stage in a software life
-maintenance cycle. The approach is very similar to what rpm already does
-when encapsulating sets of files in packages which are then ordered
-according to the package epoch, version and release.
-
-The current release of rpm (rpm-4.0.2) has added TID's to every package
-installed.  In addition, an image of the header is preserved in the rpm
-database that is identical to what was in the original package file.
-This permits rpm to reconstruct the original package from the installed
-components at any time.
-
-The next version of rpm (rpm-4.0.3, now in a release cycle now) has added the
-ability to repackage all the components to construct a copy of the original
-package as part of a software upgrade. The reconstituted package as well
-as the newly installed packages in the transaction set are all marked with
-a TID that identifies the software upgrade uniquely. Thus software
-replaced on a boxen is repackaged, and the packages can be archived
-(or otherwise saved) as part of normal software management.
-
-What remains to be done is to use the ordering property of TID's so that
-transactions can be "rolled back" to any point in the past for which
-the old packages are available. This will require a B-tree database
-index for the currently installed transaction sets, and saving the names
-of the packages that were removed. For the commonest case, a software
-upgrade, each installed package can carry the names of replaced
-(and repackaged) packages that were performed as a side effect of the
-package upgrade. Other means will be needed to keep track of transaction
-sets that only removed packages, however. Finally, a "transaction rollback"
-loop still needs to be written that will walk backwards through the ordered
-TID's, reconstructing the transaction set but reversing what packages
-are removed and/or installed.
-
-In addition to "transaction rollbacks", rpm will soon have the ability
-to apply/commit/undo software transactions atomically. The next version of
-rpm (rpm-4.0.3) already has the ability to apply/commit/undo file changes.
-The term "apply" means that the file is installed with a temporary name
-(currently just the original file name with the TID appended), "commit"
-is the operation of renaming the file and setting it's mode and ownership,
-while an "undo" is just a removal of the temporary file. The concepts
-of apply/commit/undo are being extended to packages as a set of
-file operations, and will need to be extended yet further to transaction
-sets as well.

diff --git a/doc/pl/rpm.8 b/doc/pl/rpm.8
index a14eb92..0215826 100644 (file)
--- a/doc/pl/rpm.8
+++ b/doc/pl/rpm.8
@@ -28,7 +28,7 @@ rpm \- Menedżer pakietów RPM
 \fBrpm\fR {\fB-F|--freshen\fR} [\fBopcje-instalacji\fR] \fB\fIPLIK_PAKIETU\fB\fR\fI ...\fR
 
 \fBrpm\fR {\fB-e|--erase\fR} [\fB--allmatches\fR] [\fB--nodeps\fR] [\fB--noscripts\fR]
-    [\fB--notriggers\fR] [\fB--repackage\fR] [\fB--test\fR] \fB\fINAZWA_PAKIETU\fB\fR\fI\ ...\fR
+    [\fB--notriggers\fR] [\fB--test\fR] \fB\fINAZWA_PAKIETU\fB\fR\fI\ ...\fR
 
 .SS "RÓŻNE:"
 .PP
@@ -78,7 +78,7 @@ rpm \- Menedżer pakietów RPM
  [\fB--noorder\fR] [\fB--noscripts\fR] [\fB--notriggers\fR]
  [\fB--oldpackage\fR] [\fB--percent\fR] [\fB--prefix \fINOWA_ŚCIEŻKA\fB\fR]
  [\fB--relocate \fISTARA_ŚCIEŻKA\fB=\fINOWA_ŚCIEŻKA\fB\fR]
- [\fB--repackage\fR] [\fB--replacefiles\fR] [\fB--replacepkgs\fR]
+ [\fB--replacefiles\fR] [\fB--replacepkgs\fR]
  [\fB--test\fR]
 
 .SH OPIS
@@ -310,13 +310,6 @@ na \fINOWĄ_ŚCIEŻKĘ\fR.
 Ta opcja może używana wiele razy, jeśli ma być zrelokowane kilka różnych
 \fISTARYCH_ŚCIEŻEK\fR.
 .TP
-\fB--repackage\fR
-Re-pakietuje pliki przed usunięciem. Poprzednio zainstalowany pakiet
-będzie nazwany zgodnie z makrem
-\fB%_repackage_name_fmt\fR
-i będzie utworzony w katalogu zapisanym w makrze
-\fB%_repackage_dir\fR (domyślną wartością jest \fI/var/spool/repackage\fR).
-.TP
 \fB--replacefiles\fR
 Instaluje pakiety nawet jeśli zastępują one pliki z innych, już
 zainstalowanych pakietów.
@@ -332,7 +325,7 @@ konflikty.
 Ogólną postacią komendy usuwania rpm-a jest
 .PP
 
-\fBrpm\fR {\fB-e|--erase\fR} [\fB--allmatches\fR] [\fB--nodeps\fR] [\fB--noscripts\fR] [\fB--notriggers\fR] [\fB--repackage\fR] [\fB--test\fR] \fB\fINAZWA_PAKIETU\fB\fR\fI ...\fR
+\fBrpm\fR {\fB-e|--erase\fR} [\fB--allmatches\fR] [\fB--nodeps\fR] [\fB--noscripts\fR] [\fB--notriggers\fR] [\fB--test\fR] \fB\fINAZWA_PAKIETU\fB\fR\fI ...\fR
 
 .PP
 Można użyć następujących opcji:
@@ -375,13 +368,6 @@ i wyłącza wykonywanie odpowiadających im skryptów
 \fB%triggerun\fR oraz
 \fB%triggerpostun\fR.
 .TP
-\fB--repackage\fR
-Re-pakietuje pliki przed usunięciem. Poprzednio zainstalowany pakiet
-będzie nazwany zgodnie z makrem
-\fB%_repackage_name_fmt\fR
-i będzie utworzony w katalogu zapisanym w makrze
-\fB%_repackage_dir\fR (domyślną wartością jest \fI/var/spool/repackage\fR).
-.TP
 \fB--test\fR
 Nie odinstalowuje niczego naprawdę, przechodzi tylko przez kolejne etapy.
 Przydatne w połączeniu z opcją \fB-vv\fR w celach diagnostycznych.

diff --git a/doc/rpm.8 b/doc/rpm.8
index 0a6ddde..4ed65da 100644 (file)
--- a/doc/rpm.8
+++ b/doc/rpm.8
@@ -43,7 +43,7 @@ rpm \- RPM Package Manager
 
 
 \fBrpm\fR {\fB-e|--erase\fR} [\fB--allmatches\fR] [\fB--nodeps\fR] [\fB--noscripts\fR]
-    [\fB--notriggers\fR] [\fB--repackage\fR] [\fB--test\fR] \fB\fIPACKAGE_NAME\fB\fR\fI\ ...\fR
+    [\fB--notriggers\fR] [\fB--test\fR] \fB\fIPACKAGE_NAME\fB\fR\fI\ ...\fR
 
 .SS "MISCELLANEOUS:"
 .PP
@@ -104,7 +104,7 @@ rpm \- RPM Package Manager
  [\fB--noorder\fR] [\fB--noscripts\fR] [\fB--notriggers\fR]
  [\fB--oldpackage\fR] [\fB--percent\fR] [\fB--prefix \fINEWPATH\fB\fR]
  [\fB--relocate \fIOLDPATH\fB=\fINEWPATH\fB\fR]
- [\fB--repackage\fR] [\fB--replacefiles\fR] [\fB--replacepkgs\fR]
+ [\fB--replacefiles\fR] [\fB--replacepkgs\fR]
  [\fB--test\fR]
 
 .SH "DESCRIPTION"
@@ -350,14 +350,6 @@ This option can be used repeatedly if several
 \fIOLDPATH\fR's in the package are to
 be relocated.
 .TP
-\fB--repackage\fR
-Re-package the files before erasing. The previously installed
-package will be named according to the macro
-\fB%_repackage_name_fmt\fR
-and will be created in the directory named by
-the macro \fB%_repackage_dir\fR (default value
-is \fI/var/spool/repackage\fR).
-.TP
 \fB--replacefiles\fR
 Install the packages even if they replace files from other,
 already installed, packages.
@@ -374,7 +366,7 @@ potential conflicts.
 The general form of an rpm erase command is 
 .PP
 
-\fBrpm\fR {\fB-e|--erase\fR} [\fB--allmatches\fR] [\fB--nodeps\fR] [\fB--noscripts\fR] [\fB--notriggers\fR] [\fB--repackage\fR] [\fB--test\fR] \fB\fIPACKAGE_NAME\fB\fR\fI ...\fR
+\fBrpm\fR {\fB-e|--erase\fR} [\fB--allmatches\fR] [\fB--nodeps\fR] [\fB--noscripts\fR] [\fB--notriggers\fR] [\fB--test\fR] \fB\fIPACKAGE_NAME\fB\fR\fI ...\fR
 
 .PP
 The following options may also be used:
@@ -421,14 +413,6 @@ and turns off execution of the corresponding
 \fB%triggerpostun\fR
 scriptlet(s).
 .TP
-\fB--repackage\fR
-Re-package the files before erasing. The previously installed
-package will be named according to the macro
-\fB%_repackage_name_fmt\fR
-and will be created in the directory named by
-the macro \fB%_repackage_dir\fR (default value
-is \fI/var/spool/repackage\fR).
-.TP
 \fB--test\fR
 Don't really uninstall anything, just go through the motions.
 Useful in conjunction with the \fB-vv\fR option

diff --git a/doc/ru/rpm.8 b/doc/ru/rpm.8
index 4c406ae..8f62a69 100644 (file)
--- a/doc/ru/rpm.8
+++ b/doc/ru/rpm.8
@@ -43,7 +43,7 @@ rpm \- Менеджер пакетов RPM
 
 
 \fBrpm\fR {\fB-e|--erase\fR} [\fB--allmatches\fR] [\fB--nodeps\fR] [\fB--noscripts\fR]
-    [\fB--notriggers\fR] [\fB--repackage\fR] [\fB--test\fR] \fB\fIPACKAGE_NAME\fB\fR\fI\ ...\fR
+    [\fB--notriggers\fR] [\fB--test\fR] \fB\fIPACKAGE_NAME\fB\fR\fI\ ...\fR
 
 .SS "РАЗНОЕ:"
 .PP
@@ -104,7 +104,7 @@ rpm \- Менеджер пакетов RPM
  [\fB--noorder\fR] [\fB--noscripts\fR] [\fB--notriggers\fR]
  [\fB--oldpackage\fR] [\fB--percent\fR] [\fB--prefix \fINEWPATH\fB\fR]
  [\fB--relocate \fIOLDPATH\fB=\fINEWPATH\fB\fR]
- [\fB--repackage\fR] [\fB--replacefiles\fR] [\fB--replacepkgs\fR]
+ [\fB--replacefiles\fR] [\fB--replacepkgs\fR]
  [\fB--test\fR]
 
 .SH "ОПИСАНИЕ"
@@ -340,14 +340,6 @@ rpm \- Менеджер пакетов RPM
 если требуется переместить несколько путей \fIOLDPATH\fR
 в пакете.
 .TP
-\fB--repackage\fR
-Переупаковать файлы перед удалением. Ранее установленный пакет
-будет назван в соответствии с макросом
-\fB%_repackage_name_fmt\fR
-и будет создан в каталоге, названном по значению макроса
-\fB%_repackage_dir\fR (значение по умолчанию - 
-\fI/var/spool/repackage\fR).
-.TP
 \fB--replacefiles\fR
 Установить пакеты, даже если они заменяют файлы от других
 установленных пакетов.
@@ -363,7 +355,7 @@ rpm \- Менеджер пакетов RPM
 Общая форма команды удаления rpm приведена ниже
 .PP
 
-\fBrpm\fR {\fB-e|--erase\fR} [\fB--allmatches\fR] [\fB--nodeps\fR] [\fB--noscripts\fR] [\fB--notriggers\fR] [\fB--repackage\fR] [\fB--test\fR] \fB\fIPACKAGE_NAME\fB\fR\fI ...\fR
+\fBrpm\fR {\fB-e|--erase\fR} [\fB--allmatches\fR] [\fB--nodeps\fR] [\fB--noscripts\fR] [\fB--notriggers\fR] [\fB--test\fR] \fB\fIPACKAGE_NAME\fB\fR\fI ...\fR
 
 .PP
 Следующие опции могут быть также использованы:
@@ -409,14 +401,6 @@ rpm \- Менеджер пакетов RPM
 \fB%triggerpostun\fR 
 скриптлетов.
 .TP
-\fB--repackage\fR
-Переупаковать файлы перед удалением. Ранее установленный пакет 
-будет назван в соответствии с макросом
-\fB%_repackage_name_fmt\fR
-и будет создан в каталоге, названном по значению макроса
-\fB%_repackage_dir\fR (значение по умолчанию 
-- \fI/var/spool/repackage\fR).
-.TP
 \fB--test\fR
 Не удалять пакеты, просто выполнить проверку.
 Удобно использовать этот параметр при отладке совместно