- fix: removed headers from db need a headerCopy().

CVS patchset: 4368
CVS date: 2000/12/21 21:07:41

diff --git a/CHANGES b/CHANGES
index 2c00576..5c9a6ad 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -75,6 +75,7 @@
        - remove /etc/rpm/macros.db1 configuration file if db3 rebuilt.
        - whiteout mozilla loop for 7.1.
        - immutable headers, once installed by rpm3, need to lose immutablity.
+       - fix: removed headers from db need a headerCopy().
 
 3.0.6 -> 4.0
        - use DIRNAMES/BASENAMES/DIRINDICES not FILENAMES in packages and db.

diff --git a/lib/transaction.c b/lib/transaction.c
index 7ad46f8..dbeb6ad 100644 (file)
--- a/lib/transaction.c
+++ b/lib/transaction.c
@@ -1830,7 +1830,7 @@ int rpmRunTransactions(   rpmTransactionSet ts,
                    ourrc++;
                    break;
                }
-               dbh = headerLink(dbh);
+               dbh = headerCopy(dbh);
                rpmdbFreeIterator(mi);
            }
 

diff --git a/po/cs.po b/po/cs.po
index 9ad499d..0f5b0e8 100644 (file)
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2000-12-21 12:01-0500\n"
+"POT-Creation-Date: 2000-12-21 15:42-0500\n"
 "PO-Revision-Date: 2000-08-23 22:24+0100\n"
 "Last-Translator: Milan Kerslager <milan.kerslager@spsselib.hiedu.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"

diff --git a/po/da.po b/po/da.po
index b14e30b..2b3576c 100644 (file)
--- a/po/da.po
+++ b/po/da.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2000-12-21 12:01-0500\n"
+"POT-Creation-Date: 2000-12-21 15:42-0500\n"
 "PO-Revision-Date: 2000-03-07 05:17+01:00\n"
 "Last-Translator: K. Christiansen <kenneth@gnu.org>\n"
 "Language-Team: Danish/Dansk <dansk@klid.dk>\n"

diff --git a/po/de.po b/po/de.po
index 1373d22..cb4af60 100644 (file)
--- a/po/de.po
+++ b/po/de.po
@@ -37,7 +37,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2000-12-21 12:01-0500\n"
+"POT-Creation-Date: 2000-12-21 15:42-0500\n"
 "PO-Revision-Date: 1998-08-03 18:02+02:00\n"
 "Last-Translator: Karl Eichwalder <ke@SuSE.DE>\n"
 "Language-Team: German <de@li.org>\n"

diff --git a/po/es.po b/po/es.po
index a1c49c0..7033298 100644 (file)
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2000-12-21 12:01-0500\n"
+"POT-Creation-Date: 2000-12-21 15:42-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

diff --git a/po/fi.po b/po/fi.po
index 0299b48..c49ea8f 100644 (file)
--- a/po/fi.po
+++ b/po/fi.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2000-12-21 12:01-0500\n"
+"POT-Creation-Date: 2000-12-21 15:42-0500\n"
 "Last-Translator: Raimo Koski <rkoski@pp.weppi.fi>\n"
 "Language-Team: Finnish <linux@sot.com>\n"
 "Content-Type: text/plain; charset=\n"

diff --git a/po/fr.po b/po/fr.po
index c457848..833c4c7 100644 (file)
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,5 +1,5 @@
 msgid ""
-msgstr "POT-Creation-Date: 2000-12-21 12:01-0500\n"
+msgstr "POT-Creation-Date: 2000-12-21 15:42-0500\n"
 
 #: build.c:26
 #, fuzzy, c-format

diff --git a/po/gl.po b/po/gl.po
index a1c49c0..7033298 100644 (file)
--- a/po/gl.po
+++ b/po/gl.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2000-12-21 12:01-0500\n"
+"POT-Creation-Date: 2000-12-21 15:42-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

diff --git a/po/hu.po b/po/hu.po
index a1c49c0..7033298 100644 (file)
--- a/po/hu.po
+++ b/po/hu.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2000-12-21 12:01-0500\n"
+"POT-Creation-Date: 2000-12-21 15:42-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

diff --git a/po/id.po b/po/id.po
index a1c49c0..7033298 100644 (file)
--- a/po/id.po
+++ b/po/id.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2000-12-21 12:01-0500\n"
+"POT-Creation-Date: 2000-12-21 15:42-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

diff --git a/po/is.po b/po/is.po
index 35cf295..8b2e628 100644 (file)
--- a/po/is.po
+++ b/po/is.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2000-12-21 12:01-0500\n"
+"POT-Creation-Date: 2000-12-21 15:42-0500\n"
 "PO-Revision-Date: 2000-08-02 13:00+0000\n"
 "Last-Translator: Richard Allen <ra@hp.is>\n"
 "Language-Team: is <kde-isl@mmedia.is>\n"

diff --git a/po/it.po b/po/it.po
index a1c49c0..7033298 100644 (file)
--- a/po/it.po
+++ b/po/it.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2000-12-21 12:01-0500\n"
+"POT-Creation-Date: 2000-12-21 15:42-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

diff --git a/po/ja.po b/po/ja.po
index 54ed5b0..67529ab 100644 (file)
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2000-12-21 12:01-0500\n"
+"POT-Creation-Date: 2000-12-21 15:42-0500\n"
 "PO-Revision-Date: 1999-12-01 22:49 +JST\n"
 "Last-Translator: Kanda Mitsuru <kanda@nn.iij4u.or.jp>\n"
 "Language-Team: JRPM <jrpm@linux.or.jp>\n"
@@ -88,7 +88,7 @@ msgstr "
 # build root [BuildRoot]
 # net share [¥Í¥Ã¥È¶¦Í­]
 # reloate [ºÆÇÛÃÖ/°ÜÆ°¤¹¤ë]
-# $Id: ja.po,v 1.129 2000/12/21 17:14:58 jbj Exp $
+# $Id: ja.po,v 1.130 2000/12/21 21:07:43 jbj Exp $
 #: rpm.c:185 rpmqv.c:269
 #, c-format
 msgid "rpm: %s\n"

diff --git a/po/ko.po b/po/ko.po
index a1c49c0..7033298 100644 (file)
--- a/po/ko.po
+++ b/po/ko.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2000-12-21 12:01-0500\n"
+"POT-Creation-Date: 2000-12-21 15:42-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

diff --git a/po/no.po b/po/no.po
index 08960ad..890670a 100644 (file)
--- a/po/no.po
+++ b/po/no.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2000-12-21 12:01-0500\n"
+"POT-Creation-Date: 2000-12-21 15:42-0500\n"
 "PO-Revision-Date: 2000-08-17 20:22+02:00\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian <no@li.org>\n"

diff --git a/po/pl.po b/po/pl.po
index 74d42b8..391241b 100644 (file)
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2000-12-21 12:01-0500\n"
+"POT-Creation-Date: 2000-12-21 15:42-0500\n"
 "PO-Revision-Date: 1999-05-25 17:00+0100\n"
 "Last-Translator: Pawe³ Dziekoñski <pdziekonski@mml.ch.pwr.wroc.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"

diff --git a/po/pt.po b/po/pt.po
index eae3449..669d205 100644 (file)
--- a/po/pt.po
+++ b/po/pt.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2000-12-21 12:01-0500\n"
+"POT-Creation-Date: 2000-12-21 15:42-0500\n"
 "PO-Revision-Date: 2000-08-01 21:11+01:00\n"
 "Last-Translator: Pedro Morais <morais@poli.org>\n"
 "Language-Team: pt <morais@poli.org>\n"

diff --git a/po/pt_BR.po b/po/pt_BR.po
index c571d58..596029d 100644 (file)
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -2,7 +2,7 @@
 # Revised by Arnaldo Carvalho de Melo <acme@conectiva.com.br>, 1998.
 #
 msgid ""
-msgstr "POT-Creation-Date: 2000-12-21 12:01-0500\n"
+msgstr "POT-Creation-Date: 2000-12-21 15:42-0500\n"
 
 # , c-format
 #: build.c:26

diff --git a/po/ro.po b/po/ro.po
index b1555d6..2a66ecb 100644 (file)
--- a/po/ro.po
+++ b/po/ro.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2000-12-21 12:01-0500\n"
+"POT-Creation-Date: 2000-12-21 15:42-0500\n"
 "PO-Revision-Date: 1999-04-10 12:00+EST\n"
 "Last-Translator: Cristian Gafton <gafton@redhat.com>\n"
 "Language-Team: Romanian <ro@li.org>\n"

diff --git a/po/rpm.pot b/po/rpm.pot
index 5c82d00..01d6816 100644 (file)
--- a/po/rpm.pot
+++ b/po/rpm.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-12-21 12:01-0500\n"
+"POT-Creation-Date: 2000-12-21 15:42-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

diff --git a/po/ru.po b/po/ru.po
index 554f0d4..e859c35 100644 (file)
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2000-12-21 12:01-0500\n"
+"POT-Creation-Date: 2000-12-21 15:42-0500\n"
 "PO-Revision-Date: 2000-08-08 01:20+0300\n"
 "Last-Translator: Eugene Kanter <eugene@blackcatlinux.com>\n"
 "Language-Team: Black Cat Linux Team <blackcat-support@blackcatlinux.com>\n"

diff --git a/po/sk.po b/po/sk.po
index 1236f09..92c11d6 100644 (file)
--- a/po/sk.po
+++ b/po/sk.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2000-12-21 12:01-0500\n"
+"POT-Creation-Date: 2000-12-21 15:42-0500\n"
 "PO-Revision-Date: 1999-04-08 21:37+02:00\n"
 "Last-Translator: Stanislav Meduna <stano@eunet.sk>\n"
 "Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"

diff --git a/po/sl.po b/po/sl.po
index 8ade52a..48e6033 100644 (file)
--- a/po/sl.po
+++ b/po/sl.po
@@ -1,12 +1,12 @@
 # -*- mode:po; coding:iso-latin-2; -*- Slovenian messages for Redhat pkg. mngr.
 # Copyright (C) 2000 Free Software Foundation, Inc.
 # Primo¾ Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>, 2000.
-# $Id: sl.po,v 1.114 2000/12/21 17:15:03 jbj Exp $
+# $Id: sl.po,v 1.115 2000/12/21 21:07:44 jbj Exp $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2000-12-21 12:01-0500\n"
+"POT-Creation-Date: 2000-12-21 15:42-0500\n"
 "PO-Revision-Date: 2000-10-08 19:05+0200\n"
 "Last-Translator: Grega Fajdiga <gregor.fajdiga@telemach.net>\n"
 "Language-Team: Slovenian <sl@li.org>\n"

diff --git a/po/sr.po b/po/sr.po
index 2634d51..9f09bfd 100644 (file)
--- a/po/sr.po
+++ b/po/sr.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2000-12-21 12:01-0500\n"
+"POT-Creation-Date: 2000-12-21 15:42-0500\n"
 "Content-Type: text/plain; charset=\n"
 "Date: 1998-05-02 21:41:47-0400\n"
 "From: Erik Troan <ewt@lacrosse.redhat.com>\n"

diff --git a/po/sv.po b/po/sv.po
index d09003f..af1c50b 100644 (file)
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2000-12-21 12:01-0500\n"
+"POT-Creation-Date: 2000-12-21 15:42-0500\n"
 "PO-Revision-Date: 2000-10-09 22:31+0200\n"
 "Last-Translator: Göran Uddeborg <göran@uddeborg.pp.se>\n"
 "Language-Team: Swedish <sv@li.org>\n"

diff --git a/po/tr.po b/po/tr.po
index 517379d..860b108 100644 (file)
--- a/po/tr.po
+++ b/po/tr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2000-12-21 12:01-0500\n"
+"POT-Creation-Date: 2000-12-21 15:42-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

diff --git a/po/uk.po b/po/uk.po
index a1c49c0..7033298 100644 (file)
--- a/po/uk.po
+++ b/po/uk.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2000-12-21 12:01-0500\n"
+"POT-Creation-Date: 2000-12-21 15:42-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

diff --git a/po/wa.po b/po/wa.po
index a1c49c0..7033298 100644 (file)
--- a/po/wa.po
+++ b/po/wa.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2000-12-21 12:01-0500\n"
+"POT-Creation-Date: 2000-12-21 15:42-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

diff --git a/po/zh.po b/po/zh.po
index a1c49c0..7033298 100644 (file)
--- a/po/zh.po
+++ b/po/zh.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2000-12-21 12:01-0500\n"
+"POT-Creation-Date: 2000-12-21 15:42-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

diff --git a/po/zh_CN.GB2312.po b/po/zh_CN.GB2312.po
index a1c49c0..7033298 100644 (file)
--- a/po/zh_CN.GB2312.po
+++ b/po/zh_CN.GB2312.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2000-12-21 12:01-0500\n"
+"POT-Creation-Date: 2000-12-21 15:42-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

diff --git a/rpm.spec b/rpm.spec
index 5583ecd..970f989 100644 (file)
--- a/rpm.spec
+++ b/rpm.spec
@@ -13,7 +13,7 @@ Summary: The Red Hat package management system.
 Name: rpm
 %define version 4.0.2
 Version: %{version}
-Release: 0.6
+Release: 0.7
 Group: System Environment/Base
 Source: ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/rpm-%{version}.tar.gz
 Copyright: GPL
@@ -311,6 +311,7 @@ fi
 %changelog
 * Thu Dec 21 2000 Jeff Johnson <jbj@redhat.com>
 - immutable headers, once installed by rpm3, need to lose immutablity.
+- fix: removed headers from db need a headerCopy().
 
 * Wed Dec 20 2000 Jeff Johnson <jbj@redhat.com>
 - whiteout mozilla loop for 7.1.

diff --git a/rpm.spec.in b/rpm.spec.in
index c7be002..d9406e8 100644 (file)
--- a/rpm.spec.in
+++ b/rpm.spec.in
@@ -13,7 +13,7 @@ Summary: The Red Hat package management system.
 Name: rpm
 %define version @VERSION@
 Version: %{version}
-Release: 0.6
+Release: 0.7
 Group: System Environment/Base
 Source: ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/rpm-%{version}.tar.gz
 Copyright: GPL
@@ -311,6 +311,7 @@ fi
 %changelog
 * Thu Dec 21 2000 Jeff Johnson <jbj@redhat.com>
 - immutable headers, once installed by rpm3, need to lose immutablity.
+- fix: removed headers from db need a headerCopy().
 
 * Wed Dec 20 2000 Jeff Johnson <jbj@redhat.com>
 - whiteout mozilla loop for 7.1.

diff --git a/scripts/trpm b/scripts/trpm
index 09bd28c..f5e48b7 100755 (executable)
--- a/scripts/trpm
+++ b/scripts/trpm
@@ -7,6 +7,11 @@ rpmb=/usr/bin/rpmbuild
 rpmq=/usr/bin/rpmquery
 rpmdb=$rpm
 
+#rpm=/X/src/rpm307/rpm
+#rpmb=$rpm
+#rpmq=$rpm
+#rpmdb=$rpm
+
 dist=7.0
 type=min
 arch=`$rpmq --eval '%{_arch}'`
@@ -56,7 +61,7 @@ procps-2
 psmisc-
 sed-
 shadow-utils-
-readline-2
+readline-[24]
 rmt-
 tar-
 textutils-
@@ -82,7 +87,7 @@ words-
 baseglob="
 $min2glob
 console-tools-
-gmp-2
+gmp-[23]
 initscripts-
 kernel-2
 modutils-
@@ -107,7 +112,7 @@ glibc-devel-
 gmp-devel-
 kernel-headers-
 ncurses-devel-
-readline-devel-
+readline-devel-[24]
 tcl-
 zlib-devel-
 "
@@ -125,11 +130,12 @@ gcc-2
 gettext-
 krb5-configs-
 krb5-libs-
-libstdc++-
+libstdc++-2
 libtool-
 make-
 m4-
-perl-
+openssl-0
+perl-5
 python-1
 tcsh-
 "
@@ -143,23 +149,22 @@ do
     debug)             dbg=echo        ;;
     dmalloc)           eval `dmalloc -b $dmopts`       ;;
     db1)               db1="--define '%_dbapi 1'"      ;;
-    5.2|6.2|7.0|7.1)
+    5.2|6.2|7.0|7.1|7.1x)
        dist=$cmd
        root=$top/$dist
        rc="--rcfile $top/rpmrc-$dist $db1"
        $dbg mkdir -p $root/{dev,X/RPMS,X/SRPMS}
-       [ ! -c $root/dev/null ] && $dbg $sudo mknod $root/dev/null c 1 3
-       find $root
-       cat << EOF > $top/rpmrc-$dist
+       [ -c $root/dev/null ] || $dbg $sudo mknod $root/dev/null c 1 3
+       [ -f $top/rpmrc-$dist ] || cat << EOF > $top/rpmrc-$dist
 include:    /usr/lib/rpm/rpmrc
 macrofiles: /usr/lib/rpm/macros:/usr/lib/rpm/%{_target}/macros:$top/macros:$top/macros-$dist-$arch
 EOF
-       cat << EOF > $top/macros-$dist-$arch
+       [ -f $top/macros-$dist-$arch ] || cat << EOF > $top/macros-$dist-$arch
 %_topdir       $root/X
 EOF
        ;;
     config)
-       $dbg cat << EOF > $top/macros
+       [ -f $top/macros ] || cat << EOF > $top/macros
 %_ntopdir      %{_topdir}/%{name}-%{version}-%{release}
 %_builddir     %{_ntopdir}
 %_sourcedir    %{_ntopdir}
@@ -188,6 +193,7 @@ EOF
        done
        ;;
     clean)
+       $dbg rm -f $top/{rpmrc-$dist,macros-$dist-$arch,macros}
        $dbg $sudo mv $root ${root}-$$ && $dbg $sudo rm -rf ${root}-$$
        ;;
     --rebuild)
@@ -217,7 +223,7 @@ EOF
            echo $type-$dist-$arch not found
            exit 1
        }
-       $dbg $sudo $rpm $rc --root $root $cmd --notriggers `cat $type-$dist-$arch`
+       $dbg $sudo $rpm $rc --root $root --force $cmd `cat $type-$dist-$arch`
        ;;
     -[Vqei]*|--showrc)
        $dbg $sudo $rpm $rc --root $root $cmd